Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4980 for trunk/sources


Ignore:
Timestamp:
11/28/10 15:56:17 (13 years ago)
Author:
gkronber
Message:

Updated data-analysis plugins to use ALGLIB version 3.1.0. #875

Location:
trunk/sources
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj

    r4800 r4980  
    180180      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    181181    </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\ALGLIB-2.5.0\ALGLIB-2.5.0.csproj">
    183       <Project>{29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}</Project>
    184       <Name>ALGLIB-2.5.0</Name>
    185     </ProjectReference>
    186     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\HeuristicLab.ALGLIB-2.5.0\HeuristicLab.ALGLIB-2.5.0.csproj">
    187       <Project>{01BBCB5A-144A-4A7E-908E-079849E2F7CF}</Project>
    188       <Name>HeuristicLab.ALGLIB-2.5.0</Name>
     182    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
     183      <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
     184      <Name>ALGLIB-3.1.0</Name>
     185    </ProjectReference>
     186    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
     187      <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
     188      <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
    189189    </ProjectReference>
    190190    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLabProblemsDataAnalysisRegressionPlugin.cs.frame

    r4865 r4980  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Regression", "3.3.2.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "2.5")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.1")]
    3131  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3232  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/LinearRegression/LinearRegressionSolutionCreator.cs

    r4722 r4980  
    111111
    112112      int retVal = 1;
    113       alglib.linreg.lrbuild(ref inputMatrix, nRows, nFeatures, ref retVal, ref lm, ref ar);
     113      alglib.linreg.lrbuild(inputMatrix, nRows, nFeatures, ref retVal, lm, ar);
    114114      if (retVal != 1) throw new ArgumentException("Error in calculation of linear regression model");
    115115      rmsError = ar.rmserror;

  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

    r4562 r4980  
    199199      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    200200    </ProjectReference>
    201     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\ALGLIB-2.5.0\ALGLIB-2.5.0.csproj">
    202       <Project>{29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}</Project>
    203       <Name>ALGLIB-2.5.0</Name>
     201    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
     202      <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
     203      <Name>ALGLIB-3.1.0</Name>
     204    </ProjectReference>
     205    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
     206      <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
     207      <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
    204208    </ProjectReference>
    205209    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">

  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLabProblemsDataAnalysisPlugin.cs.frame

    r4865 r4980  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis", "3.3.2.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "2.5")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.1")]
    3131  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3232  [PluginDependency("HeuristicLab.Common", "3.3")]

  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Tests/HeuristicLab.Problems.DataAnalysis.Tests-3.3.csproj

    r4477 r4980  
    139139      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    140140    </ProjectReference>
    141     <ProjectReference Include="..\..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\ALGLIB-2.5.0\ALGLIB-2.5.0.csproj">
    142       <Project>{29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}</Project>
    143       <Name>ALGLIB-2.5.0</Name>
     141    <ProjectReference Include="..\..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
     142      <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
     143      <Name>ALGLIB-3.1.0</Name>
    144144    </ProjectReference>
    145145    <ProjectReference Include="..\..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">

  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Tests/StatisticCalculatorsTest.cs

    r4722 r4980  
    6969          double tmp = 0;
    7070
    71           alglib.descriptivestatistics.calculatemoments(ref xs, n, ref mean_alglib, ref variance_alglib, ref tmp, ref tmp);
     71          alglib.samplemoments(xs, n, out  mean_alglib, out variance_alglib, out tmp, out tmp);
    7272
    7373          var calculator = new OnlineMeanAndVarianceCalculator();
    … …  
    100100            double[] xs = x.ToArray();
    101101            double[] ys = y.ToArray();
    102             double r2_alglib = alglib.correlation.pearsoncorrelation(ref xs, ref ys, n);
     102            double r2_alglib = alglib.pearsoncorrelation(xs, ys, n);
    103103            r2_alglib *= r2_alglib;
    104104
Note: See TracChangeset for help on using the changeset viewer.