Changeset 17448 for branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis

Timestamp:

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

Author:

pfleck

Message:

#3040 Replaced own Vector with MathNet.Numerics Vector.

Location:

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3

Files:

• Classification/TimeSeries/TimeSeriesInstanceProvider.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)
• Regression/VectorData/AzzaliBenchmark1.cs (modified) (2 diffs)
• Regression/VectorData/AzzaliBenchmark2.cs (modified) (3 diffs)
• Regression/VectorData/AzzaliBenchmark3.cs (modified) (3 diffs)
• Regression/VectorData/AzzaliKorns5.cs (modified) (3 diffs)
• Regression/VectorData/RandomExtensions.cs (modified) (2 diffs)
• Regression/VectorData/VectorDataTestOne.cs (modified) (1 diff)
• TableFileParser.cs (modified) (2 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/TimeSeries/TimeSeriesInstanceProvider.cs

@@ -30 +30 @@
 using System.Linq;
 using HeuristicLab.Problems.DataAnalysis;
+
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -160 +162 @@
           var numbers = variable
             .Split(',')
-            .Select(ParseNumber)
-            .ToList();
-          inputsData[i].Add(new DoubleVector(numbers));
+            .Select(ParseNumber);
+          inputsData[i].Add(DoubleVector.Build.DenseOfEnumerable(numbers));
         }
 

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

@@ -114 +114 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
+    </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.Instances.DataAnalysis/3.3/Plugin.cs.frame

@@ -35 +35 @@
   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   [PluginDependency("HeuristicLab.Random", "3.3")]
+  [PluginDependency("HeuristicLab.MathNet.Numerics", "4.9.0")]
   public class HeuristicLabProblemsInstancesDataAnalysisPlugin : PluginBase {
   }

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/AzzaliBenchmark1.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -7 +28 @@
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Random;
+using MathNet.Numerics.Statistics;
+
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/AzzaliBenchmark2.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -7 +28 @@
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Random;
+using MathNet.Numerics.Statistics;
+
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class AzzaliBenchmark2 : ArtificialRegressionDataDescriptor {
-    public override string Name { get { return "Azzali Benchmark2 B2 = ((X3 + X1) / mean(X4)) * X2"; } }
+    public override string Name { get { return "Azzali Benchmark2 B2 = ((X3 + X1) / CumMean(X4)) * X2"; } }
     public override string Description { get { return "I. Azzali, L. Vanneschi, S. Silva, I. Bakurov, and M. Giacobini, “A Vectorial Approach to Genetic Programming,” EuroGP, pp. 213–227, 2019."; } }
 
@@ -47 +71 @@
         var x4 = rand.NextDoubleVector(-5, +5, 10);
 
-        var b2 = ((x3 + x1) / x4.CumulativeMean()) * x2;
+        var cumMean = x4.MapIndexed((j, v) => x4.SubVector(0, j + 1).Mean());
+        var b2 = ((x3 + x1) / cumMean) * x2;
 
         x1Column.Add(x1);

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/AzzaliBenchmark3.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -8 +29 @@
 using HeuristicLab.Random;
 
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
+
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class AzzaliBenchmark3 : ArtificialRegressionDataDescriptor {
-    public override string Name { get { return "Azzali Benchmark2 B3 = "; } }
+    public override string Name { get { return "Azzali Benchmark2 B3 = CumMin[3,3] * (X2 / X3) + X4"; } }
     public override string Description { get { return "I. Azzali, L. Vanneschi, S. Silva, I. Bakurov, and M. Giacobini, “A Vectorial Approach to Genetic Programming,” EuroGP, pp. 213–227, 2019."; } }
 
@@ -49 +72 @@
         var x5 = rand.NextDouble(0, 1);
 
-        int p = 3, q = 3;
-        var cumulativeMin = new DoubleVector(
+        const int p = 3, q = 3;
+        var cumulativeMin = DoubleVector.Build.DenseOfEnumerable(
           Enumerable.Range(0, x1.Count)
             .Select(idx => Enumerable.Range(idx - p, q)) // build index ranges for each target entry

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/AzzaliKorns5.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -8 +29 @@
 using HeuristicLab.Random;
 
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
+
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class AzzaliKorns5 : ArtificialRegressionDataDescriptor {
-    public override string Name { get { return "Azzali Korns5 K5 ="; } }
+    public override string Name { get { return "Azzali Korns5 K5 = 3.0 + 2.23 * log(X4)"; } }
     public override string Description { get { return "I. Azzali, L. Vanneschi, S. Silva, I. Bakurov, and M. Giacobini, “A Vectorial Approach to Genetic Programming,” EuroGP, pp. 213–227, 2019."; } }
 
@@ -47 +70 @@
         var x4 = rand.NextDoubleVector(-50, +50, 10);
 
-        var k5 = 3 + 2.13 * new DoubleVector(x4.Select(d4 => Math.Log(d4)));
+        var k5 = 3 + 2.13 * x4.PointwiseLog();
 
         x1Column.Add(x1);

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/RandomExtensions.cs

@@ -1 @@
-using HeuristicLab.Core;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using HeuristicLab.Core;
 using HeuristicLab.Problems.DataAnalysis;
+
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -12 +35 @@
         values[i] = rand.NextDouble(min, max);
       }
-      return new DoubleVector(values);
+      return DoubleVector.Build.Dense(values);
     }
   }

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/VectorDataTestOne.cs

@@ -27 +27 @@
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Random;
+using MathNet.Numerics.Statistics;
+
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/TableFileParser.cs

@@ -30 +30 @@
 using HeuristicLab.Problems.DataAnalysis;
 
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
+
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class TableFileParser : Progress<long> { // reports the number of bytes read
@@ -272 +274 @@
             var vectorList = new List<DoubleVector>(stringList.Count);
             for (int j = 0; j < doubles.Length; j++) {
-              vectorList.Add(new DoubleVector(doubles[j]));
+              vectorList.Add(DoubleVector.Build.Dense(doubles[j]));
             }