Changeset 6576


Ignore:
Timestamp:
07/20/11 15:05:58 (8 years ago)
Author:
gkronber
Message:

#1475 renamed files and classes.

Location:
trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r6567 r6576  
    129129      <SubType>Code</SubType>
    130130    </Compile>
    131     <Compile Include="Linear\LogitClassificationSolution.cs" />
    132     <Compile Include="Linear\LogitModel.cs" />
    133131    <Compile Include="Linear\MultinomialLogitClassification.cs" />
     132    <Compile Include="Linear\MultinomialLogitClassificationSolution.cs" />
     133    <Compile Include="Linear\MultinomialLogitModel.cs" />
    134134    <Compile Include="Properties\AssemblyInfo.cs" />
    135135    <Compile Include="RandomForest\RandomForestClassificationSolution.cs" />
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs

    r6575 r6576  
    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    }
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassificationSolution.cs

    r6574 r6576  
    3333  /// Represents a multinomial logit solution for a classification problem which can be visualized in the GUI.
    3434  /// </summary>
    35   [Item("LogitClassificationSolution", "Represents a multinomial logit solution for a classification problem which can be visualized in the GUI.")]
     35  [Item("Multinomial Logit Classification Solution", "Represents a multinomial logit solution for a classification problem which can be visualized in the GUI.")]
    3636  [StorableClass]
    37   public sealed class LogitClassificationSolution : ClassificationSolution {
     37  public sealed class MultinomialLogitClassificationSolution : ClassificationSolution {
    3838
    39     public new LogitModel Model {
    40       get { return (LogitModel)base.Model; }
     39    public new MultinomialLogitModel Model {
     40      get { return (MultinomialLogitModel)base.Model; }
    4141      set { base.Model = value; }
    4242    }
    4343
    4444    [StorableConstructor]
    45     private LogitClassificationSolution(bool deserializing) : base(deserializing) { }
    46     private LogitClassificationSolution(LogitClassificationSolution original, Cloner cloner)
     45    private MultinomialLogitClassificationSolution(bool deserializing) : base(deserializing) { }
     46    private MultinomialLogitClassificationSolution(MultinomialLogitClassificationSolution original, Cloner cloner)
    4747      : base(original, cloner) {
    4848    }
    49     public LogitClassificationSolution(IClassificationProblemData problemData, LogitModel logitModel)
     49    public MultinomialLogitClassificationSolution(IClassificationProblemData problemData, MultinomialLogitModel logitModel)
    5050      : base(logitModel, problemData) {
    5151    }
    5252
    5353    public override IDeepCloneable Clone(Cloner cloner) {
    54       return new LogitClassificationSolution(this, cloner);
     54      return new MultinomialLogitClassificationSolution(this, cloner);
    5555    }
    5656  }
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitModel.cs

    r6575 r6576  
    3737  [StorableClass]
    3838  [Item("Multinomial Logit Model", "Represents a multinomial logit model for classification.")]
    39   public sealed class LogitModel : NamedItem, IClassificationModel {
     39  public sealed class MultinomialLogitModel : NamedItem, IClassificationModel {
    4040
    4141    private alglib.logitmodel logitModel;
     
    5858    private double[] classValues;
    5959    [StorableConstructor]
    60     private LogitModel(bool deserializing)
     60    private MultinomialLogitModel(bool deserializing)
    6161      : base(deserializing) {
    6262      if (deserializing)
    6363        logitModel = new alglib.logitmodel();
    6464    }
    65     private LogitModel(LogitModel original, Cloner cloner)
     65    private MultinomialLogitModel(MultinomialLogitModel original, Cloner cloner)
    6666      : base(original, cloner) {
    6767      logitModel = new alglib.logitmodel();
     
    7171      this.classValues = (double[])original.classValues.Clone();
    7272    }
    73     public LogitModel(alglib.logitmodel logitModel, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues)
     73    public MultinomialLogitModel(alglib.logitmodel logitModel, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues)
    7474      : base() {
    7575      this.name = ItemName;
     
    8282
    8383    public override IDeepCloneable Clone(Cloner cloner) {
    84       return new LogitModel(this, cloner);
     84      return new MultinomialLogitModel(this, cloner);
    8585    }
    8686
Note: See TracChangeset for help on using the changeset viewer.