Merge pull request #203 from relf/fix-mfkpls-bug

Fix mfkpls bug

smt/__init__.py

@@ -1 +1 @@
-__version__ = "0.5.0"
+__version__ = "0.5.1"

smt/applications/mfkpls.py

@@ -217,7 +217,7 @@ def _new_train_iteration(self, lvl):
  "n_samples=%d must be greater than the regression"
  " model size p+q=%d."
  )
- % (n_samples[i], self.p_all[lvl] + self.q_all[lvl])
+ % (n_samples_F_i, self.p_all[lvl] + self.q_all[lvl])
  )
 
  # Determine Gaussian Process model parameters
@@ -238,6 +238,7 @@ def _new_train_iteration(self, lvl):
 
  def _new_train_finalize(self, lvl):
  if self.options["eval_noise"] and self.options["optim_var"]:
+ X = self.X
  for lvl in range(self.nlvl - 1):
  self.set_training_values(
  X[lvl], self._predict_intermediate_values(X[lvl], lvl + 1), name=lvl

smt/applications/tests/test_mfkpls.py

@@ -67,6 +67,10 @@ def test_mfkpls(self):
  sm.options["xlimits"] = prob.xlimits
  sm.options["print_global"] = False
 
+ # to test some options
+ sm.options["eval_noise"] = True
+ sm.options["optim_var"] = True
+
  # modif MM
  sm.options["n_comp"] = self.n_comp
  sm.options["theta0"] = [1e-2] * self.n_comp

smt/applications/tests/test_mfkplsk.py

@@ -119,6 +119,9 @@ def test_mfkplsk_derivs(self):
  sm.options["xlimits"] = prob.xlimits
  sm.options["print_global"] = False
 
+ # to test some options
+ sm.options["eval_noise"] = False
+
  # modif MM
  sm.options["n_comp"] = self.n_comp
  sm.options["theta0"] = [1e-2] * self.n_comp