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

Timestamp:

09/22/21 13:55:10 (3 years ago)

Author:

pfleck

Message:

#3040 Switched from offset-length sub-vector to "start-end with wrapping" subvector.

Location:

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

Files:

• Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs (modified) (2 diffs)
• Symbols/WindowedSymbolTreeNode.cs (modified) (2 diffs)

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

@@ -369 +369 @@
       Func<DoubleVector, double> vFunc = null) {
 
-      var offset = node.Offset;
-      var length = node.Length;
+      // Parameters are interpreted as start and end with wrapping
+      var start = node.Offset;
+      var end = node.Length;
 
       DoubleVector SubVector(DoubleVector v) {
-        int index = (int)(offset * v.Count);
-        int count = (int)(length * (v.Count - index));
-        return v.SubVector(index, count);
-      };
+        int startIdx = (int)Math.Round(start * v.Count);
+        int endIdx = (int)Math.Round(end * 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;
+        }
+      }
 
       if (val.IsScalar && sFunc != null) return new EvaluationResult(sFunc(val.Scalar));
@@ -385 +394 @@
       Func<double, double> sFunc = null,
       Func<DoubleVector, DoubleVector> vFunc = null) {
-      var offset = node.Offset;
-      var length = node.Length;
+      // Parameters are interpreted as start and end with wrapping
+      var start = node.Offset;
+      var end = node.Length;
 
       DoubleVector SubVector(DoubleVector v) {
-        int index = (int)(offset * v.Count);
-        int count = (int)(length * (v.Count - index));
-        return v.SubVector(index, count);
-      };
+        int startIdx = (int)Math.Round(start * v.Count);
+        int endIdx = (int)Math.Round(end * 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;
+        }
+      }
 
       if (val.IsScalar && sFunc != null) return new EvaluationResult(sFunc(val.Scalar));

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/WindowedSymbolTreeNode.cs

@@ -37 +37 @@
     public double Offset {
       get { return offset; }
-      set { offset = Math.Min(Math.Max(value, 0.0), 1.0); }     
+      set { offset = Math.Min(Math.Max(value, 0.0), 1.0); }
     }
     [Storable]
@@ -88 +88 @@
     public override string ToString() {
       return Symbol.EnableWindowing 
-        ? base.ToString() + $"[{Offset} : {Length}]" 
+        ? base.ToString() + $"[{Offset:f3} : {Length:f3}]" 
         : base.ToString();
     }