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

Timestamp:

09/28/21 13:37:43 (3 years ago)

Author:

pfleck

Message:

#3040 Added a subvector symbol with ranges as subtrees.

Location:

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

Files:

• OpCodes.cs (modified) (3 diffs)
• SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs (modified) (1 diff)

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

@@ -90 +90 @@
     Covariance = 63,
     SubVector = 64,
+    SubVectorSubtree = 65,
 
     #region Time Series Symbols
@@ -195 +196 @@
     public const byte Covariance = (byte)OpCode.Covariance;
     public const byte SubVector = (byte)OpCode.SubVector;
+    public const byte SubVectorSubtree = (byte)OpCode.SubVectorSubtree;
     #region Time Series Symbols
     public const byte Median = (byte)OpCode.Median;
@@ -300 +302 @@
       { typeof(Covariance), OpCodes.Covariance },
       { typeof(SubVector), OpCodes.SubVector },
+      { typeof(SubVectorSubtree), OpCodes.SubVectorSubtree },
 
       #region Time Series Symbols

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

@@ -728 +728 @@
           }
         case OpCodes.SubVector: {
-            var cur = Evaluate(dataset, ref row, state, traceDict);
-            return WindowedFunctionApply(cur, (WindowedSymbolTreeNode)currentInstr.dynamicNode,
-              s => s,
-              v => v);
-          }
+          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;
+            }
+          }
+          var cur = Evaluate(dataset, ref row, state, traceDict);
+          TraceEvaluation(currentInstr, cur);
+          return FunctionApply(cur,
+            s => s,
+            v => {
+              var node = (IWindowedSymbolTreeNode)currentInstr.dynamicNode;
+              return SubVector(v, node.Offset, node.Length);
+            });
+          }
+        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;
+            }
+          }
+          var cur = Evaluate(dataset, ref row, state, traceDict);
+          var offset = Evaluate(dataset, ref row, state, traceDict);
+          var length = Evaluate(dataset, ref row, state, traceDict);
+          TraceEvaluation(currentInstr, cur);
+          return FunctionApply(cur,
+            s => s,
+            v => SubVector(v, offset.Scalar, length.Scalar)
+          );
+        }
         case OpCodes.Variable: {
             if (row < 0 || row >= dataset.Rows) return EvaluationResult.NaN;