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

Timestamp:

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

Author:

pfleck

Message:

#3040 Replaced own Vector with MathNet.Numerics Vector.

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (4 diffs)
• Plugin.cs.frame (modified) (1 diff)
• SymbolicDataAnalysisProblem.cs (modified) (1 diff)

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

@@ -115 +115 @@
       <HintPath>..\..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.NativeInterpreter-0.1.dll</HintPath>
       <Private>False</Private>
+    </Reference>
+    <Reference Include="MathNet.Numerics, Version=4.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\MathNet.Numerics.dll</HintPath>
     </Reference>
     <Reference Include="System" />

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;

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Plugin.cs.frame

@@ -47 +47 @@
   [PluginDependency("HeuristicLab.Random", "3.3")]
   [PluginDependency("HeuristicLab.Selection", "3.3")]
+  [PluginDependency("HeuristicLab.MathNet.Numerics", "4.9.0")]
   public class HeuristicLabProblemsDataAnalysisSymbolicPlugin : PluginBase {
   }

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

@@ -35 +35 @@
 using HeuristicLab.Problems.Instances;
 
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
+
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableType("59935E69-C4A5-480E-8FFB-D9669DE9BFD4")]