fix retransforming of incumbents

automl · Sep 7, 2016 · 3eb3329 · 3eb3329
1 parent 63c7162
commit 3eb3329
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/robo/fmin.py b/robo/fmin.py
@@ -107,7 +107,7 @@ def __init__(self, X_lower, X_upper, objective_fkt):
     results = dict()
     results["x_opt"] = task.retransform(x_best)
     results["f_opt"] = f_min
-    results["trajectory"] = task.retransform(bo.incumbents)
+    results["trajectory"] = [task.retransform(inc) for inc in bo.incumbents]
     results["runtime"] = bo.runtime
     results["overhead"] = bo.time_overhead
     return results
@@ -274,7 +274,7 @@ def basis_function(x):
 
     results = dict()
     results["x_opt"] = task.retransform(x_best)
-    results["trajectory"] = task.retransform(bo.incumbents)
+    results["trajectory"] = [task.retransform(inc) for inc in bo.incumbents]
     results["runtime"] = bo.runtime
     results["overhead"] = bo.time_overhead
     return results
@@ -440,7 +440,7 @@ def bf(x):
 
     results = dict()
     results["x_opt"] = task.retransform(x_best)
-    results["trajectory"] = task.retransform(bo.incumbents)
+    results["trajectory"] = [task.retransform(inc) for inc in bo.incumbents]
     results["runtime"] = bo.runtime
     results["overhead"] = bo.time_overhead
     return results
diff --git a/robo/solver/bayesian_optimization.py b/robo/solver/bayesian_optimization.py
@@ -154,7 +154,7 @@ def run(self, num_iterations=10, X=None, Y=None):
                 self.incumbent = np.array([self.X[best_idx]])
                 self.incumbent_value = np.array([self.Y[best_idx]])
 
-                self.incumbents.append(self.incumbent)
+                self.incumbents.append(self.incumbent[0, :])
                 self.incumbent_values.append(self.incumbent_value)
                 self.runtime.append(time.time() - self.start_time)
 
@@ -189,7 +189,7 @@ def run(self, num_iterations=10, X=None, Y=None):
             self.incumbent, self.incumbent_value = \
                     self.estimator.estimate_incumbent(startpoints)
 
-            self.incumbents.append(self.incumbent)
+            self.incumbents.append(self.incumbent[0, :])
             self.incumbent_values.append(self.incumbent_value)
 
             logger.info("New incumbent %s found in %f seconds with "