Changeset 18202 for branches

Timestamp:

01/17/22 15:43:46 (3 years ago)

Author:

pfleck

Message:

#3040 Fixed best result analysis for non-plus selection.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SegmentOptimization/SegmentOptimizationProblem.cs (modified) (2 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SegmentOptimization/SegmentOptimizationProblem.cs

@@ -156 +156 @@
       double diff = target - prediction;
 
+      if (results.TryGetValue("AggValue Diff", out var oldDiffResult)) {
+        var oldDiff = (DoubleValue)oldDiffResult.Value;
+        if (Math.Abs(oldDiff.Value) < Math.Abs(diff)) return;
+      }
+
       results.AddOrUpdateResult("Bounds", bounds);
 
@@ -180 +185 @@
       var array = new double[data.Columns];
       for (int row = 0; row < data.Rows; row++) {
-        for (int i = 0; i < array.Length; i++) array[i] = data[row, i];
-
-        var vector = DoubleVector.Build.DenseOfArray(array);
-        var segment = vector.SubVector(bounds.Start, bounds.Size);
+        for (int i = 0; i < array.Length; i++) 
+          array[i] = data[row, i];
+                                                       
+        //var vector = DoubleVector.Build.DenseOfArray(array);
+        //var segment = vector.SubVector(bounds.Start, bounds.Size);
+        var segment = DoubleVector.Build.DenseOfEnumerable(array.Skip(bounds.Start).Take(bounds.Size));
 
         switch (aggregation) {