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

Timestamp:

11/25/19 12:04:30 (5 years ago)

Author:

pfleck

Message:

#3040 Added Vector symbols to TypeCoherentExpressionGrammar & fixes.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (4 diffs)

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

@@ -552 +552 @@
             DoubleVector s = VectorEvaluate(dataset, ref row, state);
             for (int i = 1; i < currentInstr.nArguments; i++) {
-              s += Evaluate(dataset, ref row, state);
+              s += VectorEvaluate(dataset, ref row, state);
             }
             return s;
@@ -559 +559 @@
             DoubleVector s = VectorEvaluate(dataset, ref row, state);
             for (int i = 1; i < currentInstr.nArguments; i++) {
-              s -= Evaluate(dataset, ref row, state);
+              s -= VectorEvaluate(dataset, ref row, state);
             }
             return s;
@@ -566 +566 @@
             DoubleVector s = VectorEvaluate(dataset, ref row, state);
             for (int i = 1; i < currentInstr.nArguments; i++) {
-              s *= Evaluate(dataset, ref row, state);
+              s *= VectorEvaluate(dataset, ref row, state);
             }
             return s;
@@ -573 +573 @@
             DoubleVector s = VectorEvaluate(dataset, ref row, state);
             for (int i = 1; i < currentInstr.nArguments; i++) {
-              s /= Evaluate(dataset, ref row, state);
+              s /= VectorEvaluate(dataset, ref row, state);
             }
             return s;