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

Timestamp:

02/25/20 07:41:01 (4 years ago)

Author:

pfleck

Message:

#3040 Replaced own Vector with MathNet.Numerics Vector.

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

@@ -20 +20 @@
 #endregion
 
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
+
 using System;
 using System.Collections.Generic;
@@ -28 +30 @@
 using HeuristicLab.Parameters;
 using HEAL.Attic;
+using MathNet.Numerics.Statistics;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -566 +569 @@
             DoubleVector s = VectorEvaluate(dataset, ref row, state);
             for (int i = 1; i < currentInstr.nArguments; i++) {
-              s *= VectorEvaluate(dataset, ref row, state);
+              s = s.PointwiseMultiply(VectorEvaluate(dataset, ref row, state));
             }
             return s;
@@ -579 +582 @@
 
         case OpCodes.VectorVariable: {
-            if (row < 0 || row >= dataset.Rows) return new DoubleVector(new[] { double.NaN });
+            if (row < 0 || row >= dataset.Rows) return DoubleVector.Build.Dense(new[] { double.NaN });
             var vectorVarTreeNode = currentInstr.dynamicNode as VectorVariableTreeNode;
             return ((IList<DoubleVector>)currentInstr.data)[row] * vectorVarTreeNode.Weight;