Changeset 17401 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

01/16/20 12:34:45 (5 years ago)

Author:

pfleck

Message:

#3040 Added parser for new benchmark data but did not commit the data yet (too large)

Location:

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

Files:

• Grammars/TypeCoherentExpressionGrammar.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• Interpreter/OpCodes.cs (modified) (2 diffs)
• Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)
• Symbols/VectorMean.cs (moved) (moved from branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VectorAverage.cs) (2 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

@@ -123 +123 @@
       var vectorDiv = new VectorDivision();
       var vectorSum = new VectorSum();
-      var vectorAvg = new VectorAverage();
+      var vectorAvg = new VectorMean();
       #endregion
 

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

@@ -219 +219 @@
     <Compile Include="SymbolicDataAnalysisProblem.cs" />
     <Compile Include="SymbolicDataAnalysisSolutionImpactValuesCalculator.cs" />
-    <Compile Include="Symbols\VectorAverage.cs" />
+    <Compile Include="Symbols\VectorMean.cs" />
     <Compile Include="Symbols\VectorSum.cs" />
     <Compile Include="Symbols\VectorSubtraction.cs" />

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

@@ -147 +147 @@
     public const byte VectorDiv = (byte)OpCode.VectorDiv;
     public const byte VectorSum = (byte)OpCode.VectorSum;
-    public const byte VectorAvg = (byte)OpCode.VectorAvg;
+    public const byte VectorMean = (byte)OpCode.VectorAvg;
 
 
@@ -210 +210 @@
       { typeof(VectorDivision), OpCodes.VectorDiv },
       { typeof(VectorSum), OpCodes.VectorSum },
-      { typeof(VectorAverage), OpCodes.VectorAvg }
+      { typeof(VectorMean), OpCodes.VectorMean }
     };
 

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

@@ -536 +536 @@
             return v.Sum();
           }
-        case OpCodes.VectorAvg: {
+        case OpCodes.VectorMean: {
             DoubleVector v = VectorEvaluate(dataset, ref row, state);
             return v.Mean();

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

@@ -26 +26 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableType("85FF9A2E-207C-4008-BB8B-0C0363885443")]
-  [Item("VectorAverage", "Symbol that represents the average function.")]
-  public sealed class VectorAverage : Symbol {
+  [Item("VectorMean", "Symbol that represents the mean function.")]
+  public sealed class VectorMean : Symbol {
     private const int minimumArity = 1;
     private const int maximumArity = 1;
@@ -39 +39 @@
 
     [StorableConstructor]
-    private VectorAverage(StorableConstructorFlag _) : base(_) { }
-    private VectorAverage(VectorAverage original, Cloner cloner) : base(original, cloner) { }
+    private VectorMean(StorableConstructorFlag _) : base(_) { }
+    private VectorMean(VectorMean original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new VectorAverage(this, cloner);
+      return new VectorMean(this, cloner);
     }
-    public VectorAverage() : base("VectorAverage", "Symbol that represents the average function.") { }
+    public VectorMean() : base("VectorMean", "Symbol that represents the mean function.") { }
   }
 }