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

Timestamp:

03/07/22 15:45:30 (2 years ago)

Author:

pfleck

Message:

#3040 Changed SubVector symbol to include end-index in result.

File:

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

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

@@ -173 +173 @@
     }
 
-    private static double BoundedAggregation(DoubleArray data, IntRange bounds, Aggregation aggregation) {
-      var matrix = new DoubleMatrix(1, data.Length);
-      for (int i = 0; i < data.Length; i++) matrix[0, i] = data[i];
-      return BoundedAggregation(matrix, bounds, aggregation);
-    }
+    //private static double BoundedAggregation(DoubleArray data, IntRange bounds, Aggregation aggregation) {
+    //  var matrix = new DoubleMatrix(1, data.Length);
+    //  for (int i = 0; i < data.Length; i++) matrix[0, i] = data[i];
+    //  return BoundedAggregation(matrix, bounds, aggregation);
+    //}
 
     private static double BoundedAggregation(DoubleMatrix data, IntRange bounds, Aggregation aggregation) {
-      if (bounds.Size == 0) {
-        return 0;
-      }
+      //if (bounds.Size == 0) {
+      //  return 0;
+      //}
 
       var resultValues = new double[data.Rows];
       for (int row = 0; row < data.Rows; row++) {
         var vector = data.GetRow(row);
-        var segment = vector.Skip(bounds.Start).Take(bounds.Size);
+        var segment = vector.Skip(bounds.Start).Take(bounds.Size + 1); // exclusive end
         switch (aggregation) {
           case Aggregation.Sum: