Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/29/11 11:38:02 (13 years ago)
Author:
abeham
Message:

#1605

  • updated QAPAlgorithms branch
Location:
branches/QAPAlgorithms
Files:
2 deleted
9 edited
29 copied

Legend:

Unmodified
Added
Removed

  • branches/QAPAlgorithms

  • branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r6569 r6611  
    107107  </ItemGroup>
    108108  <ItemGroup>
     109    <Compile Include="RegressionWorkbench.cs" />
    109110    <Compile Include="CrossValidation.cs">
    110111      <SubType>Code</SubType>
    … …  
    112113    <Compile Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs" />
    113114    <Compile Include="FixedDataAnalysisAlgorithm.cs" />
     115    <Compile Include="Interfaces\INearestNeighbourClassificationSolution.cs" />
     116    <Compile Include="Interfaces\INearestNeighbourRegressionSolution.cs" />
     117    <Compile Include="Interfaces\INearestNeighbourModel.cs" />
     118    <Compile Include="Interfaces\INeuralNetworkEnsembleClassificationSolution.cs" />
     119    <Compile Include="Interfaces\INeuralNetworkEnsembleRegressionSolution.cs" />
     120    <Compile Include="Interfaces\INeuralNetworkEnsembleModel.cs" />
     121    <Compile Include="Interfaces\INeuralNetworkClassificationSolution.cs" />
     122    <Compile Include="Interfaces\INeuralNetworkRegressionSolution.cs" />
     123    <Compile Include="Interfaces\INeuralNetworkModel.cs" />
    114124    <Compile Include="Interfaces\IRandomForestClassificationSolution.cs" />
    115125    <Compile Include="Interfaces\IRandomForestModel.cs" />
    … …  
    129139      <SubType>Code</SubType>
    130140    </Compile>
    131     <Compile Include="Linear\LogitClassificationSolution.cs" />
    132     <Compile Include="Linear\LogitModel.cs" />
    133141    <Compile Include="Linear\MultinomialLogitClassification.cs" />
     142    <Compile Include="Linear\MultinomialLogitClassificationSolution.cs" />
     143    <Compile Include="Linear\MultinomialLogitModel.cs" />
     144    <Compile Include="NearestNeighbour\NearestNeighbourClassification.cs" />
     145    <Compile Include="NearestNeighbour\NearestNeighbourClassificationSolution.cs" />
     146    <Compile Include="NearestNeighbour\NearestNeighbourModel.cs" />
     147    <Compile Include="NearestNeighbour\NearestNeighbourRegression.cs" />
     148    <Compile Include="NearestNeighbour\NearestNeighbourRegressionSolution.cs" />
     149    <Compile Include="NeuralNetwork\NeuralNetworkEnsembleClassification.cs" />
     150    <Compile Include="NeuralNetwork\NeuralNetworkEnsembleClassificationSolution.cs" />
     151    <Compile Include="NeuralNetwork\NeuralNetworkEnsembleModel.cs" />
     152    <Compile Include="NeuralNetwork\NeuralNetworkEnsembleRegressionSolution.cs" />
     153    <Compile Include="NeuralNetwork\NeuralNetworkEnsembleRegression.cs" />
     154    <Compile Include="NeuralNetwork\NeuralNetworkClassification.cs" />
     155    <Compile Include="NeuralNetwork\NeuralNetworkClassificationSolution.cs" />
     156    <Compile Include="NeuralNetwork\NeuralNetworkModel.cs" />
     157    <Compile Include="NeuralNetwork\NeuralNetworkRegression.cs" />
     158    <Compile Include="NeuralNetwork\NeuralNetworkRegressionSolution.cs" />
    134159    <Compile Include="Properties\AssemblyInfo.cs" />
    135160    <Compile Include="RandomForest\RandomForestClassificationSolution.cs" />

  • branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs

    r6569 r6611  
    3737  /// Multinomial logit regression data analysis algorithm.
    3838  /// </summary>
    39   [Item("Multinomial logit classification", "Multinomial logit classification data analysis algorithm (wrapper for ALGLIB).")]
     39  [Item("Multinomial Logit Classification", "Multinomial logit classification data analysis algorithm (wrapper for ALGLIB).")]
    4040  [Creatable("Data Analysis")]
    4141  [StorableClass]
    … …  
    9898      relClassError = alglib.mnlrelclserror(lm, inputMatrix, nRows);
    9999
    100       LogitClassificationSolution solution = new LogitClassificationSolution(problemData, new LogitModel(lm, targetVariable, allowedInputVariables, classValues));
     100      MultinomialLogitClassificationSolution solution = new MultinomialLogitClassificationSolution(problemData, new MultinomialLogitModel(lm, targetVariable, allowedInputVariables, classValues));
    101101      return solution;
    102102    }

  • branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestClassificationSolution.cs

    r6241 r6611  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Drawing;
    25 using System.Linq;
    2622using HeuristicLab.Common;
    2723using HeuristicLab.Core;
    … …  
    4945    public RandomForestClassificationSolution(IClassificationProblemData problemData, IRandomForestModel randomForestModel)
    5046      : base(randomForestModel, problemData) {
     47      RecalculateResults();
    5148    }
    5249
    … …  
    5451      return new RandomForestClassificationSolution(this, cloner);
    5552    }
     53
     54    protected override void RecalculateResults() {
     55      CalculateResults();
     56    }
    5657  }
    5758}

  • branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestModel.cs

    r6241 r6611  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.IO;
    2524using System.Linq;
    26 using System.Text;
    2725using HeuristicLab.Common;
    2826using HeuristicLab.Core;
    2927using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3028using HeuristicLab.Problems.DataAnalysis;
    31 using SVM;
    3229
    3330namespace HeuristicLab.Algorithms.DataAnalysis {
    … …  
    134131    }
    135132
     133    public IRandomForestRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {
     134      return new RandomForestRegressionSolution(problemData, this);
     135    }
     136    IRegressionSolution IRegressionModel.CreateRegressionSolution(IRegressionProblemData problemData) {
     137      return CreateRegressionSolution(problemData);
     138    }
     139    public IRandomForestClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData) {
     140      return new RandomForestClassificationSolution(problemData, this);
     141    }
     142    IClassificationSolution IClassificationModel.CreateClassificationSolution(IClassificationProblemData problemData) {
     143      return CreateClassificationSolution(problemData);
     144    }
     145
    136146    #region events
    137147    public event EventHandler Changed;

  • branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegressionSolution.cs

    r6241 r6611  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Drawing;
    25 using System.Linq;
    2622using HeuristicLab.Common;
    2723using HeuristicLab.Core;
    … …  
    4945    public RandomForestRegressionSolution(IRegressionProblemData problemData, IRandomForestModel randomForestModel)
    5046      : base(randomForestModel, problemData) {
     47      RecalculateResults();
    5148    }
    5249

  • branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassificationSolution.cs

    r5809 r6611  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Drawing;
    25 using System.Linq;
    2622using HeuristicLab.Common;
    2723using HeuristicLab.Core;
    … …  
    4945    public SupportVectorClassificationSolution(SupportVectorMachineModel model, IClassificationProblemData problemData)
    5046      : base(model, problemData) {
     47      RecalculateResults();
    5148    }
    5249
    … …  
    5451      return new SupportVectorClassificationSolution(this, cloner);
    5552    }
     53
     54    protected override void RecalculateResults() {
     55      CalculateResults();
     56    }
    5657  }
    5758}

  • branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineModel.cs

    r6569 r6611  
    126126      return GetEstimatedValuesHelper(dataset, rows);
    127127    }
    128     #endregion
     128    public SupportVectorRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {
     129      return new SupportVectorRegressionSolution(this, problemData);
     130    }
     131    IRegressionSolution IRegressionModel.CreateRegressionSolution(IRegressionProblemData problemData) {
     132      return CreateRegressionSolution(problemData);
     133    }
     134    #endregion
     135
    129136    #region IClassificationModel Members
    130137    public IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows) {
    … …  
    147154      }
    148155    }
     156
     157    public SupportVectorClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData) {
     158      return new SupportVectorClassificationSolution(this, problemData);
     159    }
     160    IClassificationSolution IClassificationModel.CreateClassificationSolution(IClassificationProblemData problemData) {
     161      return CreateClassificationSolution(problemData);
     162    }
    149163    #endregion
    150164    // cache for predictions, which is cloned but not persisted, must be cleared when the model is changed

  • branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegressionSolution.cs

    r5809 r6611  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Drawing;
    25 using System.Linq;
    2622using HeuristicLab.Common;
    2723using HeuristicLab.Core;
    … …  
    4945    public SupportVectorRegressionSolution(SupportVectorMachineModel model, IRegressionProblemData problemData)
    5046      : base(model, problemData) {
     47      RecalculateResults();
    5148    }
    5249
Note: See TracChangeset for help on using the changeset viewer.