Changeset 9392 for branches/LearningClassifierSystems/HeuristicLab.Problems.DecisionListClassification

Timestamp:

04/23/13 13:31:29 (12 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.Problems.DecisionListClassification/3.3

Files:

• DecisionListClassificationProblem.cs (modified) (5 diffs)
• DecisionListClassificationProblemData.cs (modified) (4 diffs)
• Properties (modified) (1 prop)

branches/LearningClassifierSystems/HeuristicLab.Problems.DecisionListClassification/3.3/DecisionListClassificationProblem.cs

@@ -62 +62 @@
       get { return (IFixedValueParameter<IntValue>)Parameters["SizePenaltyMinRules"]; }
     }
-    public IFixedValueParameter<IntValue> ActivationIterationParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters["ActivationIteration"]; }
-    }
     public IFixedValueParameter<DoubleValue> InitialTheoryLengthRatioParameter {
       get { return (IFixedValueParameter<DoubleValue>)Parameters["InitialTheoryLengthRatio"]; }
@@ -88 +85 @@
     }
 
+    IStrataSingleObjectiveEvaluator IGAssistProblem.Evaluator {
+      get { return Evaluator; }
+    }
     IDecisionListEvaluator IDecisionListClassificationProblem.Evaluator {
       get { return Evaluator; }
@@ -101 +101 @@
       : base(original, cloner) {
     }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DecisionListClassificationProblem(this, cloner);
+    }
 
     public DecisionListClassificationProblem()
@@ -113 +116 @@
       Parameters.Add(new FixedValueParameter<DoubleValue>("BestKnownQuality", "", new DoubleValue(0.5)));
       Parameters.Add(new FixedValueParameter<IntValue>("SizePenaltyMinRules", "", new IntValue(4)));
-      Parameters.Add(new FixedValueParameter<IntValue>("ActivationIteration", "", new IntValue(25)));
-      Parameters.Add(new FixedValueParameter<DoubleValue>("InitialTheoryLengthRatio", "", new DoubleValue(0.075)));
-      Parameters.Add(new FixedValueParameter<DoubleValue>("WeightRelaxFactor", "", new DoubleValue(0.9)));
       Parameters.Add(new FixedValueParameter<PercentValue>("ActionMutationProbability", "", new PercentValue(0.1)));
 
       Evaluator.SizePenaltyMinRulesParameter.ActualName = "SizePenaltyMinRules";
-      // do differently
-      ((MDLEvaluator)Evaluator).MDLCalculatorParameter.Value = new MDLCalculator(ActivationIterationParameter.Value.Value, InitialTheoryLengthRatioParameter.Value.Value, WeightRelaxFactorParameter.Value.Value);
 
       InitializeOperators();
@@ -169 +167 @@
       }
     }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new DecisionListClassificationProblem(this, cloner);
-    }
 
     IParameter IGAssistProblem.ProblemDataParameter {

branches/LearningClassifierSystems/HeuristicLab.Problems.DecisionListClassification/3.3/DecisionListClassificationProblemData.cs

@@ -214 +214 @@
     }
 
-    public IEnumerable<DecisionListInput> FetchInput(IEnumerable<int> rows) {
+    public IEnumerable<IGAssistInput> FetchInput(IEnumerable<int> rows) {
       foreach (var row in rows) {
         yield return FetchInput(row);
@@ -221 +221 @@
 
     protected IDictionary<int, DecisionListInput> fetchInputCache = new Dictionary<int, DecisionListInput>();
-    public DecisionListInput FetchInput(int row) {
+    public IGAssistInput FetchInput(int row) {
       if (!fetchInputCache.ContainsKey(row)) {
         DecisionListInput input = new DecisionListInput();
@@ -234 +234 @@
     }
 
-    public IEnumerable<IAction> FetchAction(IEnumerable<int> rows) {
+    public IEnumerable<IGAssistNiche> FetchAction(IEnumerable<int> rows) {
       foreach (var row in rows) {
         yield return FetchAction(row);
@@ -240 +240 @@
     }
     protected IDictionary<int, IAction> fetchActionCache = new Dictionary<int, IAction>();
-    public IAction FetchAction(int row) {
+    public IGAssistNiche FetchAction(int row) {
       if (!fetchActionCache.ContainsKey(row)) {
         var action = (IAction)SampleRuleParameter.Value.Action.Clone();