Context Navigation

Changeset 6604 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Timestamp:

07/27/11 16:30:49 (13 years ago)

Author:

mkommend

Message:

#1600: Added possibility to create classification solutions from classification models.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Files:

r6520	r6604
89	89	}
90	90
	91	IClassificationSolution IClassificationModel.CreateClassificationSolution(IClassificationProblemData problemData) {
	92	return new ClassificationEnsembleSolution(models, problemData);
	93	}
91	94	#endregion
92	95	}

-                      r5809
+                      r6604
   [StorableClass]
   [Item("DiscriminantFunctionClassificationModel", "Represents a classification model that uses a discriminant function and classification thresholds.")]
   public class DiscriminantFunctionClassificationModel : NamedItem, IDiscriminantFunctionClassificationModel {
+  public abstract class DiscriminantFunctionClassificationModel : NamedItem, IDiscriminantFunctionClassificationModel {
     [Storable]
     private IRegressionModel model;
 …
+    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new DiscriminantFunctionClassificationModel(this, cloner);
+    }
     public void SetThresholdsAndClassValues(IEnumerable<double> thresholds, IEnumerable<double> classValues) {
       var classValuesArr = classValues.ToArray();
 …
+    }
     #endregion
+    public abstract IDiscriminantFunctionClassificationSolution CreateDiscriminantFunctionClassificationSolution(IClassificationProblemData problemData);
+    public abstract IClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData);
+  }
+}

-                      r6589
+                      r6604
       : base(original, cloner) {
+    }
-    protected DiscriminantFunctionClassificationSolution(IRegressionModel model, IClassificationProblemData problemData)
-      : this(new DiscriminantFunctionClassificationModel(model), problemData) {
+    }
     protected DiscriminantFunctionClassificationSolution(IDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData)
       : base(model, problemData) {

-                      r6589
+                      r6604
       : base(original, cloner) {
       RegisterEventHandler();
+    }
-    protected DiscriminantFunctionClassificationSolutionBase(IRegressionModel model, IClassificationProblemData problemData)
-      : this(new DiscriminantFunctionClassificationModel(model), problemData) {
+    }
     protected DiscriminantFunctionClassificationSolutionBase(IDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData)

r5809	r6604
24	24	public interface IClassificationModel : IDataAnalysisModel {
25	25	IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows);
	26	IClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData);
26	27	}
27	28	}

-                      r5809
+                      r6604
 #endregion
+using System;
 using System.Collections.Generic;
-using System;
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IDiscriminantFunctionClassificationModel : IClassificationModel {
 …
     IEnumerable<double> ClassValues { get; }
     // class values and thresholds can only be assigned simultaniously
     void SetThresholdsAndClassValues(IEnumerable<double> thresholds, IEnumerable<double> classValues);
+    void SetThresholdsAndClassValues(IEnumerable<double> thresholds, IEnumerable<double> classValues);
     IEnumerable<double> GetEstimatedValues(Dataset dataset, IEnumerable<int> rows);
     event EventHandler ThresholdsChanged;
+    IDiscriminantFunctionClassificationSolution CreateDiscriminantFunctionClassificationSolution(IClassificationProblemData problemData);
+  }
+}

Note: See TracChangeset for help on using the changeset viewer.