Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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.Algorithms.DataAnalysis/3.4
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • 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;
Note: See TracChangeset for help on using the changeset viewer.