Changeset 17931 for trunk/HeuristicLab.Problems.Instances.DataAnalysis

Timestamp:

04/09/21 19:41:33 (4 years ago)

Author:

gkronber

Message:

#3117: update alglib to version 3.17

Location:

trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3

Files:

• HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (6 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Regression/Friedman/FriedmanRandomFunction.cs (modified) (3 diffs)
• Regression/VariableNetworks/GaussianProcessVariableNetwork.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

@@ -24 +24 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>7.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -34 +34 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>7.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -56 +56 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>7.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
@@ -74 +74 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>7.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
@@ -90 +90 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>7.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
@@ -108 +108 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
+    <LangVersion>7.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+    <Reference Include="ALGLIB-3.17.0, Version=3.17.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
+      <HintPath>..\..\bin\ALGLIB-3.17.0.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />

trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Plugin.cs.frame

@@ -25 +25 @@
   [Plugin("HeuristicLab.Problems.Instances.DataAnalysis", "3.3.16.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.ALGLIB", "3.7")]
+  [PluginDependency("HeuristicLab.ALGLIB", "3.17")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Friedman/FriedmanRandomFunction.cs

@@ -121 +121 @@
       // mu is generated from same distribution as x
       double[] mu = Enumerable.Range(0, nl).Select(_ => random.NextDouble() * 2 - 1).ToArray();
-      double[,] v = new double[nl, nl];
       var condNum = 4.0 / 0.01; // as given in the paper for max and min eigen values
 
@@ -128 +127 @@
       alglib.math.rndobject = new System.Random(random.Next());
 
-      alglib.matgen.spdmatrixrndcond(nl, condNum, ref v);
+      alglib.spdmatrixrndcond(nl, condNum, out var v);
       // restore
       alglib.math.rndobject = curRand;
@@ -137 +136 @@
       for (int i = 0; i < nRows; i++) {
         for (int j = 0; j < nl; j++) z[j] = xs[j][i] - mu[j];
-        alglib.ablas.rmatrixmv(nl, nl, v, 0, 0, 0, z, 0, ref y, 0);
+        alglib.rmatrixmv(nl, nl, v, 0, 0, 0, z, 0, ref y, 0);
 
         // dot prod

trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks/GaussianProcessVariableNetwork.cs

@@ -68 +68 @@
 
       // decompose
-      alglib.trfac.spdmatrixcholesky(ref K, nRows, false);
+      alglib.spdmatrixcholesky(ref K, nRows, false);
 
 
       // calc y = Lu
       var y = new double[u.Length];
-      alglib.ablas.rmatrixmv(nRows, nRows, K, 0, 0, 0, u, 0, ref y, 0);
+      alglib.rmatrixmv(nRows, nRows, K, 0, 0, 0, u, 0, ref y, 0);
 
       // calculate relevance by removing dimensions
@@ -96 +96 @@
 
         var yChanged = new double[u.Length];
-        alglib.ablas.rmatrixmv(nRows, nRows, changedK, 0, 0, 0, u, 0, ref yChanged, 0);
+        alglib.rmatrixmv(nRows, nRows, changedK, 0, 0, 0, u, 0, ref yChanged, 0);
 
         OnlineCalculatorError error;