Changeset 9352 for branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule

Timestamp:

04/10/13 15:15:13 (12 years ago)

Author:

sforsten

Message:

#1980:

• added DecisionListView
• added event handlers in *ProblemData
• renamed project Problems.XCS.Views to Problems.lCS.Views and Problems.Instances.ConditionActionClassification to Problems.Instances.LCS
• integrated niching in GAssist and added NichingTournamentSelector
• minor code improvements and property changes

Location:

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3

Files:

• . (modified) (1 prop)
• DefaultRule/AutoDefaultRule.cs (modified) (4 diffs)
• DefaultRule/DefaultRuleOperator.cs (modified) (2 diffs)
• DefaultRule/IDefaultRuleOperator.cs (modified) (1 diff)
• DefaultRule/MajorDefaultRule.cs (modified) (1 diff)
• DefaultRule/MinorDefaultRule.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule/AutoDefaultRule.cs

@@ -44 +44 @@
       get { return (ILookupParameter<ItemArray<DoubleValue>>)Parameters["Quality"]; }
     }
-    public ILookupParameter<ItemArray<IGAssistIndividual>> IndividualParameter {
-      get { return (ILookupParameter<ItemArray<IGAssistIndividual>>)Parameters["Individual"]; }
-    }
     public IValueLookupParameter<IntValue> AccuraciesCountParameter {
       get { return (IValueLookupParameter<IntValue>)Parameters["AccuraciesCount"]; }
@@ -70 +67 @@
       Parameters.Add(new ValueLookupParameter<ItemDictionary<IGAssistNiche, ItemList<DoubleValue>>>("AverageAccuracies"));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality"));
-      Parameters.Add(new ScopeTreeLookupParameter<IGAssistIndividual>("Individual"));
       Parameters.Add(new LookupParameter<IRandom>("Random"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("AccuraciesCount"));
+      Parameters.Add(new ValueLookupParameter<IntValue>("AccuraciesCount", new IntValue(15)));
       Parameters.Add(new ValueLookupParameter<IGAssistNicheEqualityComparer>("NicheComparer"));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("NicheStandardDeviation"));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("NicheStandardDeviation", new DoubleValue(0.005)));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -82 +78 @@
     public override IOperation Apply() {
       if (NichingParameter.ActualValue == null) {
+        IList<IGAssistNiche> niches = GAssistNichesProblemDataParameter.ActualValue.GetPossibleNiches().ToList();
         NichingParameter.ActualValue = new BoolValue(true);
-        NichesParameter.ActualValue = new IntValue(PossibleDefaultClassesParameter.ActualValue.Count);
-        AverageAccuraciesParameter.ActualValue = new ItemDictionary<IGAssistNiche, ItemList<DoubleValue>>(NicheComparerParameter.ActualValue);
-        foreach (var niche in PossibleDefaultClassesParameter.ActualValue) {
+        NichesParameter.ActualValue = new IntValue(niches.Count);
+        AverageAccuraciesParameter.ActualValue = new ItemDictionary<IGAssistNiche, ItemList<DoubleValue>>(NicheComparerParameter.ActualValue as IEqualityComparer<IGAssistNiche>);
+        foreach (var niche in GAssistNichesProblemDataParameter.ActualValue.GetPossibleNiches()) {
           AverageAccuracies.Add(niche, new ItemList<DoubleValue>(AccuraciesCount));
         }
+
+        int i = 0;
+        foreach (var individual in IndividualParameter.ActualValue) {
+          individual.SetNiche(RandomParameter.ActualValue, niches[i]);
+          i++;
+          i %= niches.Count;
+        }
+
+        OperationCollection next = new OperationCollection();
+        next.Add(EvaluateSubScopes());
+        next.Add(base.Apply());
+        return next;
       } else {
         var nicheFitness = new Dictionary<IGAssistNiche, double>(NicheComparerParameter.ActualValue);
-        foreach (var niche in PossibleDefaultClassesParameter.ActualValue) {
+        foreach (var niche in GAssistNichesProblemDataParameter.ActualValue.GetPossibleNiches()) {
           nicheFitness[niche] = 0.0;
           while (AverageAccuracies[niche].Count >= AccuraciesCount) {
@@ -105 +114 @@
         }
 
-        foreach (var niche in PossibleDefaultClassesParameter.ActualValue) {
+        foreach (var niche in GAssistNichesProblemDataParameter.ActualValue.GetPossibleNiches()) {
           AverageAccuracies[niche].Insert(0, new DoubleValue(nicheFitness[niche]));
         }
 
-        var averages = new List<double>(PossibleDefaultClassesParameter.ActualValue.Count);
+        var averages = new List<double>(GAssistNichesProblemDataParameter.ActualValue.GetPossibleNiches().Count());
         if (AverageAccuracies.Values.First().Count >= AccuraciesCount) {
           foreach (var averageAccuracy in AverageAccuracies.Values) {

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule/DefaultRuleOperator.cs

@@ -42 +42 @@
       get { return (IValueLookupParameter<IGAssistNiche>)Parameters["DefaultClass"]; }
     }
-    public ILookupParameter<ItemCollection<IGAssistNiche>> PossibleDefaultClassesParameter {
-      get { return (ILookupParameter<ItemCollection<IGAssistNiche>>)Parameters["PossibleDefaultClasses"]; }
+    public ILookupParameter<IGAssistNichesProblemData> GAssistNichesProblemDataParameter {
+      get { return (ILookupParameter<IGAssistNichesProblemData>)Parameters["GAssistNichesProblemData"]; }
+    }
+    public ILookupParameter<ItemArray<IGAssistIndividual>> IndividualParameter {
+      get { return (ILookupParameter<ItemArray<IGAssistIndividual>>)Parameters["Individual"]; }
+    }
+    public IValueLookupParameter<IOperator> EvaluatorParameter {
+      get { return (IValueLookupParameter<IOperator>)Parameters["Evaluator"]; }
     }
     #endregion
@@ -57 +63 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("Niches"));
       Parameters.Add(new ValueLookupParameter<IGAssistNiche>("DefaultClass"));
-      Parameters.Add(new LookupParameter<ItemCollection<IGAssistNiche>>("PossibleDefaultClasses"));
+      Parameters.Add(new LookupParameter<IGAssistNichesProblemData>("GAssistNichesProblemData"));
+      Parameters.Add(new ScopeTreeLookupParameter<IGAssistIndividual>("Individual"));
+      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator"));
+    }
+
+    protected OperationCollection EvaluateSubScopes() {
+      IOperator evaluator = EvaluatorParameter.ActualValue;
+      OperationCollection evaluation = new OperationCollection();
+      if (evaluator != null) {
+        foreach (var subScope in ExecutionContext.Scope.SubScopes) {
+          evaluation.Add(ExecutionContext.CreateOperation(evaluator, subScope));
+        }
+      }
+      return evaluation;
     }
   }

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule/IDefaultRuleOperator.cs

@@ -26 +26 @@
   public interface IDefaultRuleOperator : IOperator {
     IValueLookupParameter<BoolValue> NichingParameter { get; }
-    ILookupParameter<IntValue> NichesParameter { get; }
-    IValueLookupParameter<Item> DefaultClassParameter { get; }
-    ILookupParameter<ItemCollection<IGAssistNiche>> PossibleDefaultClassesParameter { get; }
+    IValueLookupParameter<IntValue> NichesParameter { get; }
+    IValueLookupParameter<IGAssistNiche> DefaultClassParameter { get; }
+    ILookupParameter<IGAssistNichesProblemData> GAssistNichesProblemDataParameter { get; }
+    ILookupParameter<ItemArray<IGAssistIndividual>> IndividualParameter { get; }
+    IValueLookupParameter<IOperator> EvaluatorParameter { get; }
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule/MajorDefaultRule.cs

@@ -77 +77 @@
           index = indices[0];
         }
-        DefaultClassParameter.ActualValue = PossibleDefaultClassesParameter.ActualValue.ElementAt(index);
+        IGAssistNiche niche = GAssistNichesProblemDataParameter.ActualValue.GetPossibleNiches().ElementAt(index);
+        DefaultClassParameter.ActualValue = niche;
+
+        foreach (var individual in IndividualParameter.ActualValue) {
+          individual.SetNiche(RandomParameter.ActualValue, niche);
+        }
+
+        OperationCollection next = new OperationCollection();
+        next.Add(EvaluateSubScopes());
+        next.Add(base.Apply());
+        return next;
       }
       return base.Apply();

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule/MinorDefaultRule.cs

@@ -77 +77 @@
           index = indices[0];
         }
-        DefaultClassParameter.ActualValue = PossibleDefaultClassesParameter.ActualValue.ElementAt(index);
+        IGAssistNiche niche = GAssistNichesProblemDataParameter.ActualValue.GetPossibleNiches().ElementAt(index);
+        DefaultClassParameter.ActualValue = niche;
+
+        foreach (var individual in IndividualParameter.ActualValue) {
+          individual.SetNiche(RandomParameter.ActualValue, niche);
+        }
+
+        OperationCollection next = new OperationCollection();
+        next.Add(EvaluateSubScopes());
+        next.Add(base.Apply());
+        return next;
       }
       return base.Apply();