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

Timestamp:

04/10/13 15:15:13 (11 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)

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) {