Context Navigation

HeuristicLab.Algorithms.DataAnalysis

Timestamp:

11/02/15 21:54:58 (9 years ago)

Author:

gkronber

Message:

#1998:

introduced new class ConstantModel (to merge ConstantRegressionModel, ConstantClassificationModel and ConstantTimeSeriesModel)
fixed copyright statements
tried to unify naming
added F1 score and Matthew's correlation to classification results collection

Location:

Files:

r13090	r13098
30	30	namespace HeuristicLab.Algorithms.DataAnalysis {
31	31	[StorableClass]
32		[Item("1R Classification Model", "A model that uses intervals for one variable to determine the class.")]
	32	[Item("OneR Classification Model", "A model that uses intervals for one variable to determine the class.")]
33	33	public class OneRClassificationModel : NamedItem, IClassificationModel {
34	34	[Storable]

r13090	r13098
27	27	namespace HeuristicLab.Algorithms.DataAnalysis {
28	28	[StorableClass]
29		[Item(Name = "~~1R Classification Solution", Description = "Represents a 1R classification solution (model + data)~~.")]
	29	[Item(Name = "OneR Classification Solution", Description = "Represents a OneR classification solution which uses only a single feature with potentially multiple thresholds for class prediction.")]
30	30	public class OneRClassificationSolution : ClassificationSolution {
31	31	public new OneRClassificationModel Model {

-                      r13092
+                      r13098
         .MaxItems(kvp => kvp.Value).Select(x => x.Key).First();
       var model = new ConstantRegressionModel(dominantClass);
       var solution = new ConstantClassificationSolution(model, (IClassificationProblemData)problemData.Clone());
+      var model = new ConstantModel(dominantClass);
+      var solution = model.CreateClassificationSolution(problemData);
       return solution;
+    }

r13065	r13098
96	96	weights = new List<double>();
97	97	// add constant model
98		models.Add(new Constant~~Regression~~Model(f0));
	98	models.Add(new ConstantModel(f0));
99	99	weights.Add(1.0);
100	100	}

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