Changeset 15976 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/SampleCollector.cs

Timestamp:

06/29/18 09:07:03 (6 years ago)

Author:

jkarder

Message:

#2745: worked on EGO implementation

• added parameter for initial sample set (only for D-EGO)
• fixed project references and output paths
• minor changes

File:

• branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/SampleCollector.cs (modified) (2 diffs)

branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/SampleCollector.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -58 +60 @@
       if (data.Columns != vector.Length + 1) {
         if (data.Columns != 0 || data.Rows != 0) throw new OperatorExecutionException(this, "dataset columns do not match samplesize+1");
-        for (var i = 0; i < vector.Length; i++)
-          data.AddVariable("input" + i, new double[0]);
-        data.AddVariable("output", new double[0]);
+        data = new ModifiableDataset(
+          Enumerable.Range(0, vector.Length).Select(x => "input" + x).Concat(new[] { "output" }),
+          Enumerable.Range(0, vector.Length + 1).Select(x => new List<double>()));
+        DatasetParameter.ActualValue = data;
       }
       AddRow(data, vector, quality);
-      return base.InstrumentedApply(); ;
+      return base.InstrumentedApply();
     }