Changeset 17367 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis

Timestamp:

11/22/19 16:31:11 (5 years ago)

Author:

pfleck

Message:

#3040

• Added VectorVariable and its corresponding TreeNode.
• Added symbols for basic vector operations and symbols for sum and avg of vectors.
• Added a VectorEvaluate method in the SymbolicDataAnalysisExpressionTreeInterpreter that returns a DoubleVector instead of a double that is also called within the regular Evaluate method.

Location:

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Vectors

Files:

• DoubleVector.cs (modified) (2 diffs)
• Vector.cs (modified) (1 diff)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Vectors/DoubleVector.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Markup;
 using HEAL.Attic;
 
@@ -35 +38 @@
       : base(_) { }
 
+    public static DoubleVector operator +(DoubleVector lhs, DoubleVector rhs) {
+      return new DoubleVector(VecCalc(lhs, rhs, (l, r) => l + r));
+    }
+    public static DoubleVector operator -(DoubleVector lhs, DoubleVector rhs) {
+      return new DoubleVector(VecCalc(lhs, rhs, (l, r) => l - r));
+    }
+    public static DoubleVector operator *(DoubleVector lhs, DoubleVector rhs) {
+      return new DoubleVector(VecCalc(lhs, rhs, (l, r) => l * r));
+    }
+    public static DoubleVector operator /(DoubleVector lhs, DoubleVector rhs) {
+      return new DoubleVector(VecCalc(lhs, rhs, (l, r) => l / r));
+    }
+    private static IEnumerable<double> VecCalc(IReadOnlyList<double> lhs, IReadOnlyList<double> rhs, Func<double, double, double> resultFunc) {
+      if (lhs.Count != rhs.Count) throw new InvalidOperationException("Vectors are not of equal length.");
+      return lhs.Zip(rhs, resultFunc);
+    }
+
+    public static DoubleVector operator +(DoubleVector lhs, double rhs) {
+      return new DoubleVector(lhs.Select(l => l + rhs));
+    }
+    public static DoubleVector operator -(DoubleVector lhs, double rhs) {
+      return new DoubleVector(lhs.Select(l => l - rhs));
+    }
+    public static DoubleVector operator *(DoubleVector lhs, double rhs) {
+      return new DoubleVector(lhs.Select(l => l * rhs));
+    }
+    public static DoubleVector operator /(DoubleVector lhs, double rhs) {
+      return new DoubleVector(lhs.Select(l => l / rhs));
+    }
+
+    public double Sum() {
+      return values.Sum();
+    }
+
+    public double Average() {
+      return values.Average();
+    }
   }
 }

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Vectors/Vector.cs

@@ -28 +28 @@
   [StorableType("3574E222-1167-4F1B-93D2-01B15A7F1E84")]
   public abstract class Vector<T> : IVector<T> {
-    private readonly List<T> values;
+    [Storable]
+    protected readonly List<T> values;
 
     protected Vector(IEnumerable<T> values) {