Changeset 9392 for branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/DecisionListSolution.cs

Timestamp:

04/23/13 13:31:29 (11 years ago)

Author:

sforsten

Message:

#1980:

• several small bug fixes
• added windowing technique ILAS to GAssist
• GAssist and XCS work now with real-valued features
• severely improved the performance of XCS

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3

Files:

• . (modified) (1 prop)
• DecisionListSolution.cs (modified) (10 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/DecisionListSolution.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators.LCS;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -38 +39 @@
     private const string TestAccuracyResultName = "Accuracy (test)";
     private const string TrainingNumberOfAliveRulesName = "Number of alive rules (training)";
+    private const string TrainingAliveRulesName = "Alive Rules (training)";
     //private const string TestNumberOfAliveRules = "Number of alive rules (test)";
     private const string TrainingTheoryLengthName = "Theory Length (training)";
@@ -54 +56 @@
       private set { ((IntValue)this[TrainingNumberOfAliveRulesName].Value).Value = value; }
     }
+    public ItemSet<Rule> TrainingAliveRules {
+      get { return (ItemSet<Rule>)this[TrainingAliveRulesName].Value; }
+      private set { this[TrainingAliveRulesName].Value = value; }
+    }
     public double TrainingTheoryLength {
       get { return ((DoubleValue)this[TrainingTheoryLengthName].Value).Value; }
@@ -61 +67 @@
       get { return ((DoubleValue)this[TrainingExceptionsLengthName].Value).Value; }
       private set { ((DoubleValue)this[TrainingExceptionsLengthName].Value).Value = value; }
+    }
+
+    public int Classes {
+      get { return ProblemData.Classes; }
     }
 
@@ -79 +89 @@
     }
 
-    public IDecisionListClassificationProblemData ProblemData {
-      get { return (IDecisionListClassificationProblemData)this[ProblemDataResultName].Value; }
+    public IGAssistNichesProblemData ProblemData {
+      get { return (IGAssistNichesProblemData)this[ProblemDataResultName].Value; }
       set {
         if (this[ProblemDataResultName].Value != value) {
@@ -100 +110 @@
       description = original.Description;
     }
-    public DecisionListSolution(DecisionList model, IDecisionListClassificationProblemData problemData)
+    public DecisionListSolution(DecisionList model, IGAssistNichesProblemData problemData)
       : base() {
       name = ItemName;
@@ -109 +119 @@
       Add(new Result(TestAccuracyResultName, "Accuracy of the model on the test partition (percentage of correctly classified instances).", new PercentValue()));
       Add(new Result(TrainingNumberOfAliveRulesName, "", new IntValue()));
+      Add(new Result(TrainingAliveRulesName, "", new ItemSet<Rule>()));
       Add(new Result(TrainingTheoryLengthName, "", new DoubleValue()));
       Add(new Result(TrainingExceptionsLengthName, "", new DoubleValue()));
@@ -123 +134 @@
       var originalTrainingCondition = ProblemData.FetchInput(ProblemData.TrainingIndices);
       var originalTestCondition = ProblemData.FetchInput(ProblemData.TestIndices);
-      int numberOfAliveRules;
+      ItemSet<Rule> aliveRules;
       double theoryLength;
-      var estimatedTraining = Model.Evaluate(originalTrainingCondition, out numberOfAliveRules, out theoryLength);
-      TrainingNumberOfAliveRules = numberOfAliveRules;
+      var estimatedTraining = Model.Evaluate(originalTrainingCondition, out aliveRules, out theoryLength);
+      TrainingNumberOfAliveRules = aliveRules.Count;
+      TrainingAliveRules = aliveRules;
       TrainingTheoryLength = theoryLength;
       var estimatedTest = Model.Evaluate(originalTestCondition);
@@ -139 +151 @@
     }
 
-    private double CalculateAccuracy(IEnumerable<IAction> original, IEnumerable<IAction> estimated) {
+    public static double CalculateAccuracy(IEnumerable<IGAssistNiche> original, IEnumerable<IGAssistNiche> estimated) {
       double correctClassified = 0;
 
@@ -147 +159 @@
 
       while (originalEnumerator.MoveNext() && estimatedActionEnumerator.MoveNext()) {
-        if (originalEnumerator.Current.Match(estimatedActionEnumerator.Current)) {
+        if (originalEnumerator.Current != null && estimatedActionEnumerator.Current != null
+          && originalEnumerator.Current.SameNiche(estimatedActionEnumerator.Current)) {
           correctClassified++;
         }

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj