- Timestamp:
- 02/25/20 07:41:01 (5 years ago)
- Location:
- branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj
r17401 r17448 115 115 <HintPath>..\..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.NativeInterpreter-0.1.dll</HintPath> 116 116 <Private>False</Private> 117 </Reference> 118 <Reference Include="MathNet.Numerics, Version=4.9.0.0, Culture=neutral, processorArchitecture=MSIL"> 119 <SpecificVersion>False</SpecificVersion> 120 <HintPath>..\..\bin\MathNet.Numerics.dll</HintPath> 117 121 </Reference> 118 122 <Reference Include="System" /> -
branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs
r17401 r17448 20 20 #endregion 21 21 22 using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>; 23 22 24 using System; 23 25 using System.Collections.Generic; … … 28 30 using HeuristicLab.Parameters; 29 31 using HEAL.Attic; 32 using MathNet.Numerics.Statistics; 30 33 31 34 namespace HeuristicLab.Problems.DataAnalysis.Symbolic { … … 566 569 DoubleVector s = VectorEvaluate(dataset, ref row, state); 567 570 for (int i = 1; i < currentInstr.nArguments; i++) { 568 s *= VectorEvaluate(dataset, ref row, state);571 s = s.PointwiseMultiply(VectorEvaluate(dataset, ref row, state)); 569 572 } 570 573 return s; … … 579 582 580 583 case OpCodes.VectorVariable: { 581 if (row < 0 || row >= dataset.Rows) return new DoubleVector(new[] { double.NaN });584 if (row < 0 || row >= dataset.Rows) return DoubleVector.Build.Dense(new[] { double.NaN }); 582 585 var vectorVarTreeNode = currentInstr.dynamicNode as VectorVariableTreeNode; 583 586 return ((IList<DoubleVector>)currentInstr.data)[row] * vectorVarTreeNode.Weight; -
branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Plugin.cs.frame
r17184 r17448 47 47 [PluginDependency("HeuristicLab.Random", "3.3")] 48 48 [PluginDependency("HeuristicLab.Selection", "3.3")] 49 [PluginDependency("HeuristicLab.MathNet.Numerics", "4.9.0")] 49 50 public class HeuristicLabProblemsDataAnalysisSymbolicPlugin : PluginBase { 50 51 } -
branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs
r17369 r17448 35 35 using HeuristicLab.Problems.Instances; 36 36 37 using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>; 38 37 39 namespace HeuristicLab.Problems.DataAnalysis.Symbolic { 38 40 [StorableType("59935E69-C4A5-480E-8FFB-D9669DE9BFD4")]
Note: See TracChangeset
for help on using the changeset viewer.