Changeset 6576 for trunk/sources

Timestamp:

07/20/11 15:05:58 (13 years ago)

Author:

gkronber

Message:

#1475 renamed files and classes.

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)
• Linear/MultinomialLogitClassification.cs (modified) (1 diff)
• Linear/MultinomialLogitClassificationSolution.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LogitClassificationSolution.cs) (1 diff)
• Linear/MultinomialLogitModel.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LogitModel.cs) (4 diffs)

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

@@ -129 +129 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Linear\LogitClassificationSolution.cs" />
-    <Compile Include="Linear\LogitModel.cs" />
     <Compile Include="Linear\MultinomialLogitClassification.cs" />
+    <Compile Include="Linear\MultinomialLogitClassificationSolution.cs" />
+    <Compile Include="Linear\MultinomialLogitModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RandomForest\RandomForestClassificationSolution.cs" />

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

@@ -98 +98 @@
       relClassError = alglib.mnlrelclserror(lm, inputMatrix, nRows);
 
-      LogitClassificationSolution solution = new LogitClassificationSolution(problemData, new LogitModel(lm, targetVariable, allowedInputVariables, classValues));
+      MultinomialLogitClassificationSolution solution = new MultinomialLogitClassificationSolution(problemData, new MultinomialLogitModel(lm, targetVariable, allowedInputVariables, classValues));
       return solution;
     }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassificationSolution.cs

@@ -33 +33 @@
   /// Represents a multinomial logit solution for a classification problem which can be visualized in the GUI.
   /// </summary>
-  [Item("LogitClassificationSolution", "Represents a multinomial logit solution for a classification problem which can be visualized in the GUI.")]
+  [Item("Multinomial Logit Classification Solution", "Represents a multinomial logit solution for a classification problem which can be visualized in the GUI.")]
   [StorableClass]
-  public sealed class LogitClassificationSolution : ClassificationSolution {
+  public sealed class MultinomialLogitClassificationSolution : ClassificationSolution {
 
-    public new LogitModel Model {
-      get { return (LogitModel)base.Model; }
+    public new MultinomialLogitModel Model {
+      get { return (MultinomialLogitModel)base.Model; }
       set { base.Model = value; }
     }
 
     [StorableConstructor]
-    private LogitClassificationSolution(bool deserializing) : base(deserializing) { }
-    private LogitClassificationSolution(LogitClassificationSolution original, Cloner cloner)
+    private MultinomialLogitClassificationSolution(bool deserializing) : base(deserializing) { }
+    private MultinomialLogitClassificationSolution(MultinomialLogitClassificationSolution original, Cloner cloner)
       : base(original, cloner) {
     }
-    public LogitClassificationSolution(IClassificationProblemData problemData, LogitModel logitModel)
+    public MultinomialLogitClassificationSolution(IClassificationProblemData problemData, MultinomialLogitModel logitModel)
       : base(logitModel, problemData) {
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LogitClassificationSolution(this, cloner);
+      return new MultinomialLogitClassificationSolution(this, cloner);
     }
   }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitModel.cs

@@ -37 +37 @@
   [StorableClass]
   [Item("Multinomial Logit Model", "Represents a multinomial logit model for classification.")]
-  public sealed class LogitModel : NamedItem, IClassificationModel {
+  public sealed class MultinomialLogitModel : NamedItem, IClassificationModel {
 
     private alglib.logitmodel logitModel;
@@ -58 +58 @@
     private double[] classValues;
     [StorableConstructor]
-    private LogitModel(bool deserializing)
+    private MultinomialLogitModel(bool deserializing)
       : base(deserializing) {
       if (deserializing)
         logitModel = new alglib.logitmodel();
     }
-    private LogitModel(LogitModel original, Cloner cloner)
+    private MultinomialLogitModel(MultinomialLogitModel original, Cloner cloner)
       : base(original, cloner) {
       logitModel = new alglib.logitmodel();
@@ -71 +71 @@
       this.classValues = (double[])original.classValues.Clone();
     }
-    public LogitModel(alglib.logitmodel logitModel, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues)
+    public MultinomialLogitModel(alglib.logitmodel logitModel, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues)
       : base() {
       this.name = ItemName;
@@ -82 +82 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LogitModel(this, cloner);
+      return new MultinomialLogitModel(this, cloner);
     }