Changeset 18234 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter

Timestamp:

03/14/22 11:35:10 (3 years ago)

Author:

pfleck

Message:

#3040 Fixed vector-unrolling AutoDiff conversion.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs (modified) (3 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs

@@ -728 +728 @@
           }
         case OpCodes.SubVector: {
-            DoubleVector SubVector(DoubleVector v , double start, double end) { 
-              int size = v.Count;
-              int ToIdx(double x) {
-                int idx = (int)Math.Round(x * (size - 1));
-                return (idx % size + size) % size; // positive mod
-              }
-              int startIdx = ToIdx(start);
-              int endIdx = ToIdx(end);
-              if (startIdx <= endIdx) {
-                return v.SubVector(startIdx, count: endIdx - startIdx + 1); // incl end
-              } else { // wrap around
-                var resultVector = DoubleVector.Build.Dense(size: size - (startIdx - endIdx) + 1);
-                v.CopySubVectorTo(resultVector, sourceIndex: startIdx, targetIndex: 0,               count: size - startIdx); // copy [startIdx:size] to [0:size-startIdx]
-                v.CopySubVectorTo(resultVector, sourceIndex: 0,        targetIndex: size - startIdx, count: endIdx);          // copy [0:endIdx]      to [size-startIdx:size]
-                return resultVector;
-              }
+            DoubleVector SubVector(DoubleVector v , double start, double end) {
+              int startIdx = ToVectorIdx(start, v.Count), endIdx = ToVectorIdx(end, v.Count);
+              return RoundTripSubVector(v, startIdx, endIdx);
             }
             var cur = Evaluate(dataset, ref row, state, traceDict);
@@ -756 +743 @@
         case OpCodes.SubVectorSubtree: {
             DoubleVector SubVector(DoubleVector v, double start, double end) {
-              int Mod(int x, int m) => (x % m + m) % m;
-              int startIdx = Mod((int)Math.Round(start * v.Count), v.Count);
-              int endIdx = Mod((int)Math.Round(end * v.Count), v.Count);
-              int size = v.Count;
-              if (startIdx < endIdx) {
-                return v.SubVector(startIdx, count: endIdx - startIdx);
-              } else { // wrap around
-                var resultVector = DoubleVector.Build.Dense(size: size - (startIdx - endIdx));
-                v.CopySubVectorTo(resultVector, startIdx, 0, size - startIdx); // copy [startIdx:size] to [0:size-startIdx]
-                v.CopySubVectorTo(resultVector, 0, size - startIdx, endIdx);   // copy [0:endIdx]      to [size-startIdx:size]
-                return resultVector;
-              }
+              int startIdx = ToVectorIdx(start, v.Count), endIdx = ToVectorIdx(end, v.Count);
+              return RoundTripSubVector(v, startIdx, endIdx);
             }
             var cur = Evaluate(dataset, ref row, state, traceDict);
@@ -1187 +1164 @@
     }
 
+    public static int ToVectorIdx(double relPosition, int size) {
+      int idx = (int)Math.Round(relPosition * (size - 1));
+      return (idx % size + size) % size; // positive mod
+    }
+
+    public static IEnumerable<Tuple<int, int>>/*start, count*/ GetVectorSlices(int startIdx, int endIdx, int size) {
+      if (startIdx <= endIdx) {
+        yield return Tuple.Create(startIdx, endIdx - startIdx + 1); // incl end
+      } else {
+        yield return Tuple.Create(startIdx, size - startIdx); // startIdx to end of vector
+        yield return Tuple.Create(0, endIdx);                 // start to endIdx of vector
+      }
+    }
+   
+    public static DoubleVector RoundTripSubVector(DoubleVector v, int startIdx, int endIdx) {
+      var slices = GetVectorSlices(startIdx, endIdx, v.Count).ToList();
+      var totalSize = slices.Sum(s => s.Item2);
+      var resultVector = DoubleVector.Build.Dense(size: totalSize);
+
+      var curIdx = 0;
+      foreach (var slice in slices) {
+        int start = slice.Item1, count = slice.Item2;
+        v.CopySubVectorTo(resultVector, sourceIndex: start, targetIndex: curIdx, count: count);
+        curIdx += count;
+      }
+      return resultVector;
+    }
+
     private static int LongestStrikeAbove(DoubleVector v, double threshold) {
       int longestStrike = 0, currentStrike = 0;