Changeset 9392 for branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/DecisionList.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)
• DecisionList.cs (modified) (3 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/DecisionList.cs

@@ -80 +80 @@
 
     // for convenience
-    public IEnumerable<IAction> Evaluate(IEnumerable<DecisionListInput> input) {
-      int numberOfAliveRules;
-      return Evaluate(input, out numberOfAliveRules);
+    public IEnumerable<IAction> Evaluate(IEnumerable<IGAssistInput> input) {
+      ItemSet<Rule> aliveRules;
+      return Evaluate(input, out aliveRules);
     }
     // for convenience
-    public IEnumerable<IAction> Evaluate(IEnumerable<DecisionListInput> input, out int numberOfAliveRules) {
+    public IEnumerable<IAction> Evaluate(IEnumerable<IGAssistInput> input, out ItemSet<Rule> aliveRules) {
       double theoryLengtgh;
-      return Evaluate(input, out numberOfAliveRules, out theoryLengtgh);
+      return Evaluate(input, out aliveRules, out theoryLengtgh);
     }
-    public IEnumerable<IAction> Evaluate(IEnumerable<DecisionListInput> input, out int numberOfAliveRules, out double theoryLengtgh) {
+    public IEnumerable<IAction> Evaluate(IEnumerable<IGAssistInput> input, out ItemSet<Rule> aliveRules, out double theoryLength) {
       var estimated = new List<IAction>();
-      var activatedRules = new HashSet<Rule>();
+      var activatedRules = new ItemSet<Rule>();
+      int count = 0;
       foreach (var dli in input) {
+        count++;
         foreach (var rule in rules) {
           if (rule.MatchInput(dli)) {
@@ -100 +102 @@
           }
         }
+        if (count > estimated.Count) {
+          estimated.Add(defaultAction);
+        }
       }
-      numberOfAliveRules = activatedRules.Count;
-      theoryLengtgh = activatedRules.Sum(x => x.ComputeTheoryLength());
+      aliveRules = activatedRules;
+      theoryLength = activatedRules.Sum(x => x.ComputeTheoryLength());
 
       return estimated;
+    }
+
+    public void RemoveRules(IEnumerable<Rule> deadRules) {
+      foreach (var deadRule in deadRules) {
+        Rules.Remove(deadRule);
+      }
     }
 
@@ -145 +156 @@
       }
     }
+
+    public IGAssistSolution CreateGAssistSolution(IGAssistNichesProblemData problemData) {
+      return new DecisionListSolution(this, problemData);
+    }
     #endregion
   }

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