Changeset 15976 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteSampleCollector.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/DiscreteEGO/DiscreteSampleCollector.cs (modified) (2 diffs)

branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteSampleCollector.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -59 +61 @@
       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]);
-      }
-      AddRow(data, vector, quality);
-      return base.InstrumentedApply(); ;
+        var variableNames = vector.Select((x, i) => string.Format("input" + i)).Concat("output".ToEnumerable());
+        var variableValues = vector.Select(x => (double)x).Concat(quality.ToEnumerable()).Select(x => new List<double> { x });
+        data = DatasetParameter.ActualValue = new ModifiableDataset(variableNames, variableValues);
+      } else AddRow(data, vector, quality);
+
+      return base.InstrumentedApply();
     }