From afdd87674021f84da248ee5b9352d2279ff13f91 Mon Sep 17 00:00:00 2001
From: kohlhaasrebecca <rebecca.kohlhaas@outlook.com>
Date: Mon, 17 Jun 2024 14:21:05 +0200
Subject: [PATCH] Finished BMC without model, remaining issue in JA for all
cases
---
.../model-comparison/example_model_comparison.py | 13 ++++++++++---
.../test_analytical_function_noMetaMod.py | 7 +++++--
src/bayesvalidrox/surrogate_models/engine.py | 2 +-
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/examples/model-comparison/example_model_comparison.py b/examples/model-comparison/example_model_comparison.py
index 249a0f0c3..9020dd535 100644
--- a/examples/model-comparison/example_model_comparison.py
+++ b/examples/model-comparison/example_model_comparison.py
@@ -33,11 +33,9 @@ from bayesvalidrox.pylink.pylink import PyLinkForwardModel
from bayesvalidrox.surrogate_models.inputs import Input
from bayesvalidrox.surrogate_models.exp_designs import ExpDesigns
from bayesvalidrox.surrogate_models.surrogate_models import MetaModel
-#from bayesvalidrox.surrogate_models.meta_model_engine import MetaModelEngine
from bayesvalidrox.post_processing.post_processing import PostProcessing
-from bayesvalidrox.bayes_inference.bayes_inference import BayesInference
from bayesvalidrox.bayes_inference.discrepancy import Discrepancy
-from bayes_inference.bayes_model_comparison import BayesModelComparison
+from bayesvalidrox.bayes_inference.bayes_model_comparison import BayesModelComparison
from bayesvalidrox.surrogate_models.engine import Engine
@@ -285,7 +283,11 @@ if __name__ == "__main__":
# BME Bootstrap optuions
opts_bootstrap = {
"bootstrap": True,
+<<<<<<< HEAD
"n_samples": 10000,
+=======
+ "n_samples": 100,#0,#0,#0, # TODO: difference between this and the n_bootstrap set below?
+>>>>>>> 1eb9d524 (Finished BMC without model, remaining issue in JA for all cases)
"Discrepancy": DiscrepancyOpts,
"emulator": True,
"plot_post_pred": False
@@ -294,8 +296,13 @@ if __name__ == "__main__":
# Run model comparison
BayesOpts = BayesModelComparison(
justifiability=True,
+<<<<<<< HEAD
n_bootstarp=100,#00,
just_n_meas=2
+=======
+ n_bootstrap=100,#0,#0,#00,
+ #just_n_meas=2
+>>>>>>> 1eb9d524 (Finished BMC without model, remaining issue in JA for all cases)
)
output_dict = BayesOpts.create_model_comparison(
meta_models,
diff --git a/examples/only-model/test_analytical_function_noMetaMod.py b/examples/only-model/test_analytical_function_noMetaMod.py
index 1d5139b0d..7419d20a9 100644
--- a/examples/only-model/test_analytical_function_noMetaMod.py
+++ b/examples/only-model/test_analytical_function_noMetaMod.py
@@ -294,7 +294,7 @@ if __name__ == "__main__":
# BME Bootstrap options
opts_bootstrap = {
"bootstrap": True,
- "n_samples": 100,#0,#0, # TODO: difference between this and the n_bootstrap set below?
+ "n_samples": 10,#0,#0, # TODO: difference between this and the n_bootstrap set below?
"Discrepancy": DiscrepancyOpts,
"emulator": False,
"plot_post_pred": False
@@ -303,14 +303,17 @@ if __name__ == "__main__":
# Run model comparison
BayesOpts = BayesModelComparison(
justifiability=True,
- n_bootstrap=100,#0,#00,
+ n_bootstrap=10,#0,#00,
#just_n_meas=2
emulator = False
)
+ # For Debug
output_dict = BayesOpts.model_comparison_all(
meta_models,
opts_bootstrap
)
+ BayesOpts.model_names = ['linear', 'exponential', 'cosine']
+ BayesOpts.calc_justifiability_analysis(meta_models, opts_bootstrap)
# Save the results
with open('model_comparison_output_dict.pkl', 'wb') as output:
diff --git a/src/bayesvalidrox/surrogate_models/engine.py b/src/bayesvalidrox/surrogate_models/engine.py
index eed4db25a..ee5f85de9 100644
--- a/src/bayesvalidrox/surrogate_models/engine.py
+++ b/src/bayesvalidrox/surrogate_models/engine.py
@@ -366,7 +366,7 @@ class Engine():
if self.emulator:
return mean_pred, std_pred
else:
- return mean_pred
+ return mean_pred, None
>>>>>>> 99013313 (Small fixes, start on ModelComp without MetaModel)
--
GitLab