Changeset 15343 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteSampleCollector.cs

Timestamp:

08/29/17 11:28:16 (7 years ago)

Author:

bwerth

Message:

#2745 added discretized EGO-version for use with IntegerVectors

Location:

branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO

Files:

• . (added)
• DiscreteSampleCollector.cs (copied) (copied from branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/SampleCollector.cs) (4 diffs)

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

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
@@ -30 +30 @@
 
 namespace HeuristicLab.Algorithms.EGO {
-  /// <summary>
-  /// A base class for operators that manipulate real-valued vectors.
-  /// </summary>
-  [Item("SampleCollector", "Collects RealVectors into a modifiablbe dataset")]
+  [Item("DiscreteSampleCollector", "Collects IntegerVectors into a modifiablbe dataset")]
   [StorableClass]
-  public class SampleCollector : InstrumentedOperator {
+  public class DiscreteSampleCollector : InstrumentedOperator {
     public override bool CanChangeName => true;
 
-    public ILookupParameter<RealVector> RealVectorParameter => (ILookupParameter<RealVector>)Parameters["RealVector"];
+    public ILookupParameter<IntegerVector> IntegerVectorParameter => (ILookupParameter<IntegerVector>)Parameters["IntegerVector"];
     public ILookupParameter<DoubleValue> QualityParameter => (ILookupParameter<DoubleValue>)Parameters["Quality"];
     public ILookupParameter<ModifiableDataset> DatasetParameter => (ILookupParameter<ModifiableDataset>)Parameters["Dataset"];
 
     [StorableConstructor]
-    protected SampleCollector(bool deserializing) : base(deserializing) { }
-    protected SampleCollector(SampleCollector original, Cloner cloner) : base(original, cloner) { }
-    public SampleCollector() {
-      Parameters.Add(new LookupParameter<RealVector>("RealVector", "The vector which should be collected."));
+    protected DiscreteSampleCollector(bool deserializing) : base(deserializing) { }
+    protected DiscreteSampleCollector(DiscreteSampleCollector original, Cloner cloner) : base(original, cloner) { }
+    public DiscreteSampleCollector() {
+      Parameters.Add(new LookupParameter<IntegerVector>("IntegerVector", "The vector which should be collected."));
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality associated which this vector"));
       Parameters.Add(new LookupParameter<ModifiableDataset>("Dataset", "The Dataset in wich new samples are stored."));
@@ -52 +49 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SampleCollector(this, cloner);
+      return new DiscreteSampleCollector(this, cloner);
     }
 
     public sealed override IOperation InstrumentedApply() {
-      var vector = RealVectorParameter.ActualValue;
+      var vector = IntegerVectorParameter.ActualValue;
       var quality = QualityParameter.ActualValue.Value;
       var data = DatasetParameter.ActualValue;
@@ -71 +68 @@
 
 
-    private static void AddRow(ModifiableDataset data, RealVector vector, double quality) {
+    private static void AddRow(ModifiableDataset data, IntegerVector vector, double quality) {
       var row = new object[vector.Length + 1];
       for (var i = 0; i < vector.Length; i++)
-        row[i] = vector[i];
+        row[i] = (double)vector[i];
       row[vector.Length] = quality;
       data.AddRow(row);