Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12817


Ignore:
Timestamp:
07/30/15 16:55:22 (8 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
Files:
1 deleted
37 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/HeuristicLab.Algorithms.CMAEvolutionStrategy-3.4.csproj

    r12790 r12817  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     101    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <SpecificVersion>False</SpecificVersion>
     103      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103104      <Private>False</Private>
    104105    </Reference>

  • trunk/sources/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/Plugin.cs.frame

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Algorithms.CMAEvolutionStrategy", "3.4.22.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Algorithms.CMAEvolutionStrategy-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.7")]
    3131  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3232  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs

    r12792 r12817  
    168168      alglib.densesolverreport denseSolveRep;
    169169
    170       var res = alglib.spdmatrixcholesky(ref l, n, false);
     170      var res = alglib.trfac.spdmatrixcholesky(ref l, n, false);
    171171      if (!res) throw new ArgumentException("Matrix is not positive semidefinite");
    172172
    … …  
    297297
    298298      // for stddev
    299       alglib.rmatrixlefttrsm(n, newN, l, 0, 0, false, false, 0, ref sWKs, 0, 0);
     299      alglib.ablas.rmatrixlefttrsm(n, newN, l, 0, 0, false, false, 0, ref sWKs, 0, 0);
    300300
    301301      for (int i = 0; i < newN; i++) {

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r12790 r12817  
    107107  </PropertyGroup>
    108108  <ItemGroup>
    109     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    110       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     109    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     110      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    111111      <Private>False</Private>
    112112    </Reference>

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

    r12792 r12817  
    4747    private LinearRegression(LinearRegression original, Cloner cloner)
    4848      : base(original, cloner) {
    49 
    5049    }
    5150    public LinearRegression()
    … …  
    7877        throw new NotSupportedException("Linear regression does not support NaN or infinity values in the input dataset.");
    7978
    80       alglib.linearmodel lm;
    81       alglib.lrreport ar;
     79      alglib.linearmodel lm = new alglib.linearmodel();
     80      alglib.lrreport ar = new alglib.lrreport();
    8281      int nRows = inputMatrix.GetLength(0);
    8382      int nFeatures = inputMatrix.GetLength(1) - 1;
    84       double[] coefficients;
     83      double[] coefficients = new double[nFeatures + 1]; // last coefficient is for the constant
    8584
    8685      int retVal = 1;

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs

    r12792 r12817  
    7474        throw new NotSupportedException("Multinomial logit classification does not support NaN or infinity values in the input dataset.");
    7575
    76       alglib.logitmodel lm;
    77       alglib.mnlreport rep;
     76      alglib.logitmodel lm = new alglib.logitmodel();
     77      alglib.mnlreport rep = new alglib.mnlreport();
    7878      int nRows = inputMatrix.GetLength(0);
    7979      int nFeatures = inputMatrix.GetLength(1) - 1;

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkModel.cs

    r12790 r12817  
    6363      : base(original, cloner) {
    6464      multiLayerPerceptron = new alglib.multilayerperceptron();
    65 
     65      multiLayerPerceptron.innerobj.chunks = (double[,])original.multiLayerPerceptron.innerobj.chunks.Clone();
    6666      multiLayerPerceptron.innerobj.columnmeans = (double[])original.multiLayerPerceptron.innerobj.columnmeans.Clone();
    6767      multiLayerPerceptron.innerobj.columnsigmas = (double[])original.multiLayerPerceptron.innerobj.columnsigmas.Clone();
    … …  
    163163    private double[,] MultiLayerPerceptronChunks {
    164164      get {
    165         // ignore this property in alglib version >= 3.9.0
    166         return null;
    167       }
    168       set {
    169         // ignore this property in alglib version >= 3.9.0
     165        return multiLayerPerceptron.innerobj.chunks;
     166      }
     167      set {
     168        multiLayerPerceptron.innerobj.chunks = value;
    170169      }
    171170    }

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Plugin.cs.frame

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Algorithms.DataAnalysis", "Provides wrappers for data analysis algorithms implemented in external libraries (linear regression, linear discriminant analysis, k-means clustering, support vector classification and regression)", "3.4.8.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Algorithms.DataAnalysis-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    3131  [PluginDependency("HeuristicLab.Algorithms.GradientDescent", "3.3")]
    3232  [PluginDependency("HeuristicLab.Analysis", "3.3")]

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/TimeSeries/AutoregressiveModeling.cs

    r12792 r12817  
    100100
    101101
    102       alglib.linearmodel lm;
    103       alglib.lrreport ar;
     102      alglib.linearmodel lm = new alglib.linearmodel();
     103      alglib.lrreport ar = new alglib.lrreport();
    104104      int nRows = inputMatrix.GetLength(0);
    105105      int nFeatures = inputMatrix.GetLength(1) - 1;

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/HeuristicLab.Algorithms.GradientDescent-3.3.csproj

    r12790 r12817  
    109109  </PropertyGroup>
    110110  <ItemGroup>
    111     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    112       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     111    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     112      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    113113      <Private>False</Private>
    114114    </Reference>

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/Plugin.cs.frame

    r12790 r12817  
    2525  [Plugin("HeuristicLab.Algorithms.GradientDescent", "3.3.12.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Algorithms.GradientDescent-3.3.dll", PluginFileType.Assembly)]
    27   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     27  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    2828  [PluginDependency("HeuristicLab.Analysis", "3.3.0")]
    2929  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • trunk/sources/HeuristicLab.Analysis.Statistics.Views/3.3/HeuristicLab.Analysis.Statistics.Views-3.3.csproj

    r12790 r12817  
    105105  </PropertyGroup>
    106106  <ItemGroup>
    107     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     107    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     108      <SpecificVersion>False</SpecificVersion>
     109      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    109110      <Private>False</Private>
    110111    </Reference>

  • trunk/sources/HeuristicLab.Analysis.Statistics.Views/3.3/Plugin.cs.frame

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Analysis.Statistics.Views", "3.3.12.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Analysis.Statistics.Views-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    3131  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3232  [PluginDependency("HeuristicLab.Analysis.Views", "3.3")]

  • trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r12790 r12817  
    105105  </PropertyGroup>
    106106  <ItemGroup>
    107     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     107    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     108      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    109109      <Private>False</Private>
    110110    </Reference>

  • trunk/sources/HeuristicLab.Analysis/3.3/Plugin.cs.frame

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Analysis", "3.3.12.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Analysis-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    3131  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3232  [PluginDependency("HeuristicLab.Common", "3.3")]

  • trunk/sources/HeuristicLab.ExtLibs.sln

    r12790 r12817  
    3737Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoDiff-1.0", "HeuristicLab.ExtLibs\HeuristicLab.AutoDiff\1.0\AutoDiff-1.0\AutoDiff-1.0.csproj", "{62551FD3-C21F-4E16-A7FC-6A017508809C}"
    3838EndProject
     39Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ALGLIB-3.7.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.7.0\ALGLIB-3.7.0\ALGLIB-3.7.0.csproj", "{AE723DEF-1A44-4F9C-8670-DBCAB79626A2}"
     40EndProject
     41Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ALGLIB-3.7.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.7.0\HeuristicLab.ALGLIB-3.7.0\HeuristicLab.ALGLIB-3.7.0.csproj", "{6F1D7847-D610-4E52-A184-405DAEFA41A9}"
     42EndProject
    3943Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetScilab-1.0", "HeuristicLab.ExtLibs\HeuristicLab.DotNetScilab\1.0\DotNetScilab-1.0\DotNetScilab-1.0.csproj", "{C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}"
    4044EndProject
    … …  
    6872EndProject
    6973Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SimSharp-3.0.7", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.7\HeuristicLab.SimSharp-3.0.7\HeuristicLab.SimSharp-3.0.7.csproj", "{5C93CAF7-AE6A-4540-95B2-5DA6761A2677}"
    70 EndProject
    71 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ALGLIB-3.9.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.9.0\ALGLIB-3.9.0\ALGLIB-3.9.0.csproj", "{AE723DEF-1A44-4F9C-8670-DBCAB79626A2}"
    72 EndProject
    73 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ALGLIB-3.9.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.9.0\HeuristicLab.ALGLIB-3.9.0\HeuristicLab.ALGLIB-3.9.0.csproj", "{6F1D7847-D610-4E52-A184-405DAEFA41A9}"
    7474EndProject
    7575Global
    … …  
    251251    {62551FD3-C21F-4E16-A7FC-6A017508809C}.Release|x86.ActiveCfg = Release|x86
    252252    {62551FD3-C21F-4E16-A7FC-6A017508809C}.Release|x86.Build.0 = Release|x86
     253    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     254    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
     255    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|x64.ActiveCfg = Debug|x64
     256    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|x64.Build.0 = Debug|x64
     257    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|x86.ActiveCfg = Debug|x86
     258    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|x86.Build.0 = Debug|x86
     259    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
     260    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|Any CPU.Build.0 = Release|Any CPU
     261    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|x64.ActiveCfg = Release|x64
     262    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|x64.Build.0 = Release|x64
     263    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|x86.ActiveCfg = Release|x86
     264    {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|x86.Build.0 = Release|x86
     265    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     266    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     267    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|x64.ActiveCfg = Debug|x64
     268    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|x64.Build.0 = Debug|x64
     269    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|x86.ActiveCfg = Debug|x86
     270    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|x86.Build.0 = Debug|x86
     271    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     272    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|Any CPU.Build.0 = Release|Any CPU
     273    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x64.ActiveCfg = Release|x64
     274    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x64.Build.0 = Release|x64
     275    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x86.ActiveCfg = Release|x86
     276    {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x86.Build.0 = Release|x86
    253277    {C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    254278    {C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    443467    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x86.ActiveCfg = Release|x86
    444468    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x86.Build.0 = Release|x86
    445     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    446     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
    447     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|x64.ActiveCfg = Debug|x64
    448     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|x64.Build.0 = Debug|x64
    449     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|x86.ActiveCfg = Debug|x86
    450     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Debug|x86.Build.0 = Debug|x86
    451     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
    452     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|Any CPU.Build.0 = Release|Any CPU
    453     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|x64.ActiveCfg = Release|x64
    454     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|x64.Build.0 = Release|x64
    455     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|x86.ActiveCfg = Release|x86
    456     {AE723DEF-1A44-4F9C-8670-DBCAB79626A2}.Release|x86.Build.0 = Release|x86
    457     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    458     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
    459     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|x64.ActiveCfg = Debug|x64
    460     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|x64.Build.0 = Debug|x64
    461     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|x86.ActiveCfg = Debug|x86
    462     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Debug|x86.Build.0 = Debug|x86
    463     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
    464     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|Any CPU.Build.0 = Release|Any CPU
    465     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x64.ActiveCfg = Release|x64
    466     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x64.Build.0 = Release|x64
    467     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x86.ActiveCfg = Release|x86
    468     {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x86.Build.0 = Release|x86
    469469  EndGlobalSection
    470470  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj

    r12790 r12817  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     101    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103103      <Private>False</Private>
    104104    </Reference>

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Plugin.cs.frame

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Classification","Provides classes to perform symbolic classification (single- or multiobjective).", "3.4.8.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    3131  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3232  [PluginDependency("HeuristicLab.Common", "3.3")]

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

    r12790 r12817  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     101    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <SpecificVersion>False</SpecificVersion>
     103      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103104      <Private>False</Private>
    104105    </Reference>

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Plugin.cs.frame

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression","Provides classes to perform symbolic regression (single- or multiobjective).", "3.4.8.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    3131  [PluginDependency("HeuristicLab.AutoDiff", "1.0")]
    3232  [PluginDependency("HeuristicLab.Analysis", "3.3")]

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.csproj

    r12790 r12817  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     101    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    103102      <Private>False</Private>
    104103    </Reference>

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/Plugin.cs.frame

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis","Provides classes to perform symbolic time-series prognosis.", "3.4.8.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    3131  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3232  [PluginDependency("HeuristicLab.Common", "3.3")]

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

    r12790 r12817  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     101    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103103      <Private>False</Private>
    104104    </Reference>

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame

    r12790 r12817  
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll", PluginFileType.Assembly)]
    3030  [PluginFile("displayModelFrame.html", PluginFileType.Data)]
    31   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     31  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    3232  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3333  [PluginDependency("HeuristicLab.Common", "3.3")]

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.cs

    r12792 r12817  
    276276          }
    277277          // wilcoxon signed rank test is used because the impact values of two variables in a single run are not independent
    278           alglib.wilcoxonsignedranktest(z, z.Length, 0, out bothTails, out leftTail, out rightTail);
     278          alglib.wsr.wilcoxonsignedranktest(z, z.Length, 0, ref bothTails, ref leftTail, ref rightTail);
    279279          matrix[row, numberOfRuns + 3] = Math.Round(bothTails, 4);
    280280        }

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

    r12790 r12817  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     101    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103103      <Private>False</Private>
    104104    </Reference>

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

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic","Provides base classes for symbolic data analysis tasks.", "3.4.8.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    3131  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3232  [PluginDependency("HeuristicLab.Collections", "3.3")]

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

    r12790 r12817  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     101    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103103      <Private>False</Private>
    104104    </Reference>

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

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Views", "Provides views for base classes for data analysis tasks.", "3.4.8.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
    3131  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3232  [PluginDependency("HeuristicLab.Collections", "3.3")]

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

    r12790 r12817  
    9999  </PropertyGroup>
    100100  <ItemGroup>
    101     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.9.0.dll</HintPath>
     101    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103103      <Private>False</Private>
    104104    </Reference>

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

    r12792 r12817  
    3131      }
    3232
    33       double[] correlations;
    34       alglib.corrr1dcircular(values, values.Length, values, values.Length, out correlations);
     33      double[] correlations = new double[values.Length];
     34      alglib.corr.corrr1dcircular(values, values.Length, values, values.Length, ref correlations);
    3535      return correlations;
    3636    }

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

    r12792 r12817  
    4141        var original = originalValues.ToArray();
    4242        var estimated = estimatedValues.ToArray();
    43         rs = alglib.spearmancorr2(original, estimated, original.Length);
     43        rs = alglib.basestat.spearmancorr2(original, estimated, original.Length);
    4444        errorState = OnlineCalculatorError.None;
    4545      }

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

    r12790 r12817  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis","Provides base classes for data analysis tasks.", "3.4.8.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB","3.9")]
     30  [PluginDependency("HeuristicLab.ALGLIB","3.7.0")]
    3131  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3232  [PluginDependency("HeuristicLab.Common", "3.3")]

  • trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GaussianProcessRegressionSampleTest.cs

    r12801 r12817  
    5050      gpr.Seed = 1618551877;
    5151      SamplesUtils.RunAlgorithm(gpr);
    52       Assert.AreEqual(-940.474793302855, SamplesUtils.GetDoubleResult(gpr, "NegativeLogLikelihood"), 1E-8);
    53       Assert.AreEqual(0.9955923436207, SamplesUtils.GetDoubleResult(gpr, "Training R²"), 1E-8);
     52      Assert.AreEqual(-940.39914958616748, SamplesUtils.GetDoubleResult(gpr, "NegativeLogLikelihood"));
     53      Assert.AreEqual(0.995614091354263, SamplesUtils.GetDoubleResult(gpr, "Training R²"));
    5454    }
    5555

  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchRFClassificationScriptTest.cs

    r12798 r12817  
    5858      var bestSolution = ScriptingUtils.GetVariable<IClassificationSolution>(script, BestSolutionVariableName);
    5959      Assert.AreEqual(0.85179407176287, bestSolution.TrainingAccuracy, 1E-8);
    60       Assert.AreEqual(0.825, bestSolution.TestAccuracy, 1E-8);
     60      Assert.AreEqual(0.81875, bestSolution.TestAccuracy, 1E-8);
    6161    }
    6262

  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchRFRegressionScriptTest.cs

    r12798 r12817  
    5757
    5858      var bestSolution = ScriptingUtils.GetVariable<IRegressionSolution>(script, BestSolutionVariableName);
    59       Assert.AreEqual(0.964863318788504, bestSolution.TrainingRSquared, 1E-8);
    60       Assert.AreEqual(0.984757886306994, bestSolution.TestRSquared, 1E-8);
     59      Assert.AreEqual(0.968329534139836, bestSolution.TrainingRSquared, 1E-8);
     60      Assert.AreEqual(0.982380790563445, bestSolution.TestRSquared, 1E-8);
    6161    }
    6262

  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r12791 r12817  
    109109  </PropertyGroup>
    110110  <ItemGroup>
    111     <Reference Include="ALGLIB-3.9.0, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    112       <HintPath>..\bin\ALGLIB-3.9.0.dll</HintPath>
     111    <Reference Include="ALGLIB-3.7.0">
     112      <HintPath>..\bin\ALGLIB-3.7.0.dll</HintPath>
    113113      <Private>False</Private>
    114114    </Reference>
Note: See TracChangeset for help on using the changeset viewer.