Context Navigation

Changeset 17400 for branches/3040_VectorBasedGP

Timestamp:

01/14/20 13:19:04 (5 years ago)

Author:

pfleck

Message:

#3040 Added Azzali benchmarks

Location:

branches/3040_VectorBasedGP

Files:

r17369	r17400
538	538	case OpCodes.VectorAvg: {
539	539	DoubleVector v = VectorEvaluate(dataset, ref row, state);
540		return v.~~Average~~();
	540	return v.Mean();
541	541	}
542	542

-                      r17367
+                      r17400
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Markup;
 using HEAL.Attic;
 …
+    }
+    public double DotProduct(DoubleVector other) {
+      return (this * other).Sum();
+    }
     public static DoubleVector operator +(DoubleVector lhs, double rhs) {
       return new DoubleVector(lhs.Select(l => l + rhs));
 …
+    }
+    public static DoubleVector operator +(double lhs, DoubleVector rhs) {
+      return new DoubleVector(rhs.Select(r => lhs + r));
+    }
+    public static DoubleVector operator -(double lhs, DoubleVector rhs) {
+      return new DoubleVector(rhs.Select(r => lhs - r));
+    }
+    public static DoubleVector operator *(double lhs, DoubleVector rhs) {
+      return new DoubleVector(rhs.Select(r => lhs * r));
+    }
+    public static DoubleVector operator /(double lhs, DoubleVector rhs) {
+      return new DoubleVector(rhs.Select(r => lhs / r));
+    }
     public double Sum() {
       return values.Sum();
+    }
     public double Average() {
+    public double Mean() {
       return values.Average();
+    }
+    public DoubleVector CumulativeMean() {
+      return new DoubleVector(
+        Enumerable.Range(0, this.Count)
+          .Select(this.Take)
+          .Select(numbers => numbers.Average())
+      );
+    }
+  }

-                      r17364
+                      r17400
       var rand = new MersenneTwister((uint)Seed);
       return new List<IDataDescriptor> {
+        new VectorDataTestOne(rand.Next())
+        new VectorDataTestOne(rand.Next()),
+        new AzzaliKorns5(rand.Next()),
+        new AzzaliBenchmark1(rand.Next()),
+        new AzzaliBenchmark2(rand.Next()),
+        new AzzaliBenchmark3(rand.Next())
       };
+    }

-                      r17365
+                      r17400
       for (int i = 0; i < 100; i++) {
         x1 = GetRandomDouble(-2, 2, rand);
         x2 = GetRandomDouble(2, 6, rand);
         x3 = GetRandomDouble(0, 1, rand);
+        x1 = rand.NextDouble(-2, 2);
+        x2 = rand.NextDouble(2, 6);
+        x3 = rand.NextDouble(0, 1);
         int length = rand.Next(3, 6);
+        v1 = GetRandomDoubleVector(-2, 2, length, rand);
+        v2 = GetRandomDoubleVector(3, 5, length, rand);
+        y = x1 * v1.Sum() + x2 * v2.Average();
+        v1 = rand.NextDoubleVector(-2, 2, length);
+        v2 = rand.NextDoubleVector(3, 5, length);
+        y = x1 * v1.Sum() + x2 * v2.Mean();
         x1Column.Add(x1);
 …
       return new List<IList> { x1Column, x2Column, x3Column, v1Column, v2Column, yColumn };
+    }
-    private static double GetRandomDouble(double min, double max, IRandom rand) {
-      return (max - min) * rand.NextDouble() + min;
+    }
-    private static DoubleVector GetRandomDoubleVector(double min, double max, int length, IRandom rand) {
-      var values = new double[length];
-      for (int i = 0; i < values.Length; i++) {
-        values[i] = GetRandomDouble(min, max, rand);
+      }
-      return new DoubleVector(values);
+    }
+  }
+}

r16908	r17400
598	598	<Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\OnlineCalculatorPerformanceTest.cs" />
599	599	<Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\StatisticCalculatorsTest.cs" />
	600	<Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\ConstantOptimizationWithVectorsTest.cs" />
600	601	<Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\DeriveTest.cs" />
601	602	<Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\InfixExpressionParserTest.cs" />

Note: See TracChangeset for help on using the changeset viewer.