Changeset 12817 for trunk/sources/HeuristicLab.Problems.DataAnalysis

Timestamp:

07/30/15 16:55:22 (9 years ago)

Author:

gkronber

Message:

#2435 reverse merge of all trunk changes for updating to alglib version 3.9.0 (r12790:12792, r12798, r12801)

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• OnlineCalculators/AutoCorrelationCalculator.cs (modified) (1 diff)
• OnlineCalculators/DependencyCalculator/SpearmansRankCorrelationCoefficientCalculator.cs (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -99 +99 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
+    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
       <Private>False</Private>
     </Reference>

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/AutoCorrelationCalculator.cs

@@ -31 +31 @@
       }
 
-      double[] correlations;
-      alglib.corrr1dcircular(values, values.Length, values, values.Length, out correlations);
+      double[] correlations = new double[values.Length];
+      alglib.corr.corrr1dcircular(values, values.Length, values, values.Length, ref correlations);
       return correlations;
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/DependencyCalculator/SpearmansRankCorrelationCoefficientCalculator.cs

@@ -41 +41 @@
         var original = originalValues.ToArray();
         var estimated = estimatedValues.ToArray();
-        rs = alglib.spearmancorr2(original, estimated, original.Length);
+        rs = alglib.basestat.spearmancorr2(original, estimated, original.Length);
         errorState = OnlineCalculatorError.None;
       }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Plugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Problems.DataAnalysis","Provides base classes for data analysis tasks.", "3.4.8.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.DataAnalysis-3.4.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.ALGLIB","3.9")]
+  [PluginDependency("HeuristicLab.ALGLIB","3.7.0")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]