Skip to content
Snippets Groups Projects
Commit 0aef32a3 authored by Rebecca Kohlhaas's avatar Rebecca Kohlhaas
Browse files

Merge branch 'develop' into 'fix/BMC'

# Conflicts:
#   src/bayesvalidrox/bayes_inference/bayes_inference.py
#   src/bayesvalidrox/bayes_inference/bayes_model_comparison.py
#   src/bayesvalidrox/bayes_inference/mcmc.py
parents cd0e1ebb 3a112da3
No related branches found
No related tags found
3 merge requests!29Preparation for release 1.1.0: fixes and test for pages,!22Update bvr in branch,!20Tests for BayesInf and general cleanup
......@@ -180,7 +180,7 @@ class MCMC:
initsamples = np.swapaxes(np.array([initsamples]),0,1) # TODO: test if this still works with multiple input dists
except:
# when aPCE selected - gaussian kernel distribution
inputSamples = self.BayesOpts.engine.ExpDesign.raw_data.T
inputSamples = BayesObj.engine.ExpDesign.raw_data.T
random_indices = np.random.choice(
len(inputSamples), size=self.nwalkers, replace=False
)
......@@ -206,7 +206,7 @@ class MCMC:
initsamples[:, idx_dim] = dist.rvs(size=self.nwalkers)
# Update lower and upper
BayesObj.engine.MetaModel.ExpDesign.bound_tuples = bound_tuples
BayesObj.engine.ExpDesign.bound_tuples = bound_tuples
# Check if sigma^2 needs to be inferred
if Discrepancy.opt_sigma != 'B': # TODO: why !='B'?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment