From 64af35e2327a3cab9c58d1066c2f300ee3fa598b Mon Sep 17 00:00:00 2001
From: Farid Mohammadi <farid.mohammadi@iws.uni-stuttgart.de>
Date: Mon, 12 Sep 2022 10:44:06 +0200
Subject: [PATCH] [surrogate][expdesign] fix resample bug and pass user defined
params to chaospy lognormal.
---
src/bayesvalidrox/surrogate_models/exp_designs.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/bayesvalidrox/surrogate_models/exp_designs.py b/src/bayesvalidrox/surrogate_models/exp_designs.py
index 2caa086e5..94f41469c 100644
--- a/src/bayesvalidrox/surrogate_models/exp_designs.py
+++ b/src/bayesvalidrox/surrogate_models/exp_designs.py
@@ -413,9 +413,9 @@ class ExpDesigns:
elif 'lognorm' in dist_type.lower():
polytype = 'hermite'
- Mu = np.log(params[0]**2/np.sqrt(params[0]**2 + params[1]**2))
- Sigma = np.sqrt(np.log(1 + params[1]**2 / params[0]**2))
- dist = chaospy.LogNormal(mu=Mu, sigma=Sigma)
+ # Mu = np.log(params[0]**2/np.sqrt(params[0]**2 + params[1]**2))
+ # Sigma = np.sqrt(np.log(1 + params[1]**2 / params[0]**2))
+ dist = chaospy.LogNormal(mu=params[0], sigma=params[1])
elif 'expon' in dist_type.lower():
polytype = 'arbitrary'
@@ -478,7 +478,10 @@ class ExpDesigns:
# store the raw data with given random indices
samples[:, pa_idx] = self.raw_data[pa_idx, rand_idx]
else:
- samples = self.JDist.resample(int(n_samples)).T
+ try:
+ samples = self.JDist.resample(int(n_samples)).T
+ except AttributeError:
+ samples = self.JDist.sample(int(n_samples)).T
# Check if all samples are in the bound_tuples
for idx, param_set in enumerate(samples):
if not self._check_ranges(param_set, self.bound_tuples):
--
GitLab