Changeset 5717 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification

Timestamp:

03/16/11 16:34:31 (14 years ago)

Author:

gkronber

Message:

#1418 Implemented interactive simplifier views for symbolic classification and regression.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj (modified) (2 diffs)
• Interfaces/ISymbolicDiscriminantFunctionClassificationModel.cs (modified) (1 diff)
• SymbolicClassificationSolution.cs (modified) (2 diffs)
• SymbolicDiscriminantFunctionClassificationSolution.cs (modified) (2 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj

@@ -112 +112 @@
     <Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer.cs" />
     <Compile Include="SymbolicDiscriminantFunctionClassificationModel.cs" />
-    <Compile Include="SymbolicDiscriminantFunctionClassificationSolution.cs" />
     <Compile Include="Interfaces\ISymbolicClassificationModel.cs" />
     <Compile Include="Interfaces\ISymbolicClassificationSolution.cs" />
@@ -130 +129 @@
     </Compile>
     <Compile Include="SymbolicClassificationSolution.cs" />
+    <Compile Include="SymbolicDiscriminantFunctionClassificationSolution.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <None Include="HeuristicLab.snk" />
     <None Include="HeuristicLabProblemsDataAnalysisSymbolicClassificationPlugin.cs.frame" />

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Interfaces/ISymbolicDiscriminantFunctionClassificationModel.cs

@@ -22 +22 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
-  public interface ISymbolicDiscriminantFunctionClassificationModel : IDiscriminantFunctionClassificationModel, ISymbolicDataAnalysisModel {
+  public interface ISymbolicDiscriminantFunctionClassificationModel : IDiscriminantFunctionClassificationModel, ISymbolicClassificationModel {
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationSolution.cs

@@ -38 +38 @@
   [StorableClass]
   [Item(Name = "SymbolicClassificationSolution", Description = "Represents a symbolic classification solution (model + data) and attributes of the solution like accuracy and complexity.")]
-  public class SymbolicClassificationSolution : ClassificationSolution, ISymbolicClassificationSolution {
+  public sealed class SymbolicClassificationSolution : ClassificationSolution, ISymbolicClassificationSolution {
     #region ISymbolicClassificationSolution Members
 
     public new ISymbolicClassificationModel Model {
       get { return (ISymbolicClassificationModel)base.Model; }
+      set { base.Model = value; }
     }
 
@@ -51 +52 @@
     #endregion
     [StorableConstructor]
-    protected SymbolicClassificationSolution(bool deserializing) : base(deserializing) { }
-    protected SymbolicClassificationSolution(SymbolicClassificationSolution original, Cloner cloner)
+    private SymbolicClassificationSolution(bool deserializing) : base(deserializing) { }
+    private SymbolicClassificationSolution(SymbolicClassificationSolution original, Cloner cloner)
       : base(original, cloner) {
     }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationSolution.cs

@@ -38 +38 @@
   [StorableClass]
   [Item(Name = "SymbolicDiscriminantFunctionClassificationSolution", Description = "Represents a symbolic classification solution (model + data) and attributes of the solution like accuracy and complexity.")]
-  public class SymbolicDiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolution, ISymbolicClassificationSolution {
-    #region ISymbolicClassificationSolution Members
+  public sealed class SymbolicDiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolution, ISymbolicClassificationSolution {
 
-    public new IDiscriminantFunctionClassificationModel Model {
-      get { return (IDiscriminantFunctionClassificationModel)base.Model; }
+    public new ISymbolicDiscriminantFunctionClassificationModel Model {
+      get { return (ISymbolicDiscriminantFunctionClassificationModel)base.Model; }
+      set { base.Model = value; }
     }
 
     ISymbolicClassificationModel ISymbolicClassificationSolution.Model {
-      get { return (ISymbolicClassificationModel)Model; }
+      get { return Model; }
     }
 
     ISymbolicDataAnalysisModel ISymbolicDataAnalysisSolution.Model {
-      get { return (ISymbolicDataAnalysisModel)Model; }
+      get { return Model; }
     }
 
-    #endregion
     [StorableConstructor]
-    protected SymbolicDiscriminantFunctionClassificationSolution(bool deserializing) : base(deserializing) { }
-    protected SymbolicDiscriminantFunctionClassificationSolution(SymbolicDiscriminantFunctionClassificationSolution original, Cloner cloner)
+    private SymbolicDiscriminantFunctionClassificationSolution(bool deserializing) : base(deserializing) { }
+    private SymbolicDiscriminantFunctionClassificationSolution(SymbolicDiscriminantFunctionClassificationSolution original, Cloner cloner)
       : base(original, cloner) {
     }
-    public SymbolicDiscriminantFunctionClassificationSolution(IDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData)
+    public SymbolicDiscriminantFunctionClassificationSolution(ISymbolicDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData)
       : base(model, problemData) {
     }
@@ -65 +64 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SymbolicDiscriminantFunctionClassificationSolution(this, cloner);
-    }  
+    }
   }
 }