Changeset 9352 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3

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.Algorithms.GAssist/3.3

Files:

• GAssist.cs (modified) (10 diffs)
• GAssistMainLoop.cs (modified) (6 diffs)

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3/GAssist.cs

@@ -47 +47 @@
     #region Problem Properties
     public override Type ProblemType {
-      get { return typeof(ISingleObjectiveHeuristicOptimizationProblem); }
-    }
-    public new ISingleObjectiveHeuristicOptimizationProblem Problem {
-      get { return (ISingleObjectiveHeuristicOptimizationProblem)base.Problem; }
+      get { return typeof(IGAssistProblem); }
+    }
+    public new IGAssistProblem Problem {
+      get { return (IGAssistProblem)base.Problem; }
       set { base.Problem = value; }
     }
@@ -65 +65 @@
       get { return (ValueParameter<IntValue>)Parameters["PopulationSize"]; }
     }
-    public IConstrainedValueParameter<ISelector> SelectorParameter {
-      get { return (IConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
+    public IConstrainedValueParameter<IDefaultRuleOperator> DefaultRuleParameter {
+      get { return (IConstrainedValueParameter<IDefaultRuleOperator>)Parameters["DefaultRule"]; }
+    }
+    public IConstrainedValueParameter<INichingSingleObjectiveSelector> SelectorParameter {
+      get { return (IConstrainedValueParameter<INichingSingleObjectiveSelector>)Parameters["Selector"]; }
     }
     private ValueParameter<PercentValue> CrossoverProbabilityParameter {
@@ -134 +137 @@
       set { PopulationSizeParameter.Value = value; }
     }
-    public ISelector Selector {
+    public INichingSingleObjectiveSelector Selector {
       get { return SelectorParameter.Value; }
       set { SelectorParameter.Value = value; }
@@ -192 +195 @@
       Parameters.Add(new ValueParameter<BoolValue>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
       Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions.", new IntValue(100)));
-      Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction."));
+      Parameters.Add(new ConstrainedValueParameter<INichingSingleObjectiveSelector>("Selector", "The operator used to select solutions for reproduction."));
       Parameters.Add(new ValueParameter<PercentValue>("CrossoverProbability", "The probability that the Crossover operator is applied on a solution.", new PercentValue(0.9)));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
@@ -208 +211 @@
       Parameters.Add(new FixedValueParameter<IntValue>("MaximumNumberOfIntervals", "", new IntValue(5)));
       Parameters.Add(new FixedValueParameter<IntValue>("InitialNumberOfRules", "", new IntValue(20)));
+      Parameters.Add(new ConstrainedValueParameter<IDefaultRuleOperator>("DefaultRule", ""));
       Parameters.Add(new ConstrainedValueParameter<IDiscreteDoubleValueModifier>("ReinitializeCurveOperator", ""));
       Parameters.Add(new ValueParameter<ItemCollection<IDiscretizer>>("Discretizers", "", new ItemCollection<IDiscretizer>()));
@@ -236 +240 @@
       resultsCollector.Successor = mainLoop;
 
+      mainLoop.DefaultRuleParameter.ActualName = DefaultRuleParameter.Name;
       mainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
       mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
@@ -251 +256 @@
       mainLoop.ReinitializationProbabilityOperatorParameter.ActualName = ReinitializeCurveOperatorParameter.Name;
 
-      foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
+      foreach (INichingSingleObjectiveSelector selector in ApplicationManager.Manager.GetInstances<INichingSingleObjectiveSelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
         SelectorParameter.ValidValues.Add(selector);
-      ISelector proportionalSelector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("ProportionalSelector"));
-      if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
+      //INichingSingleObjectiveSelector proportionalSelector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("ProportionalSelector"));
+      //if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
       ParameterizeSelectors();
 
@@ -349 +354 @@
       ParameterizeAnalyzers();
       ParameterizeIterationBasedOperators();
+      UpdateDefaultRuleOperators();
       UpdateCrossovers();
       UpdateMutators();
@@ -430 +436 @@
     }
     private void ParameterizeSelectors() {
-      foreach (ISelector selector in SelectorParameter.ValidValues) {
+      foreach (INichingSingleObjectiveSelector selector in SelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
         selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSizeParameter.Value.Value - ElitesParameter.Value.Value));
         selector.NumberOfSelectedSubScopesParameter.Hidden = true;
+        selector.ParentsPerChildParameter.Value = new IntValue(2);
         ParameterizeStochasticOperator(selector);
       }
       if (Problem != null) {
-        foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
+        foreach (INichingSingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<INichingSingleObjectiveSelector>()) {
           selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
           selector.MaximizationParameter.Hidden = true;
           selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
           selector.QualityParameter.Hidden = true;
+          selector.NichingParameter.ActualName = Problem.NichingParameterName;
+          selector.GAssistNichesProblemDataParameter.ActualName = Problem.ProblemDataParameter.Name;
+          //change
+          selector.IndividualParameter.ActualName = "DecisionList";
         }
       }
@@ -468 +479 @@
       }
     }
+    private void UpdateDefaultRuleOperators() {
+      IDefaultRuleOperator oldDefaultRule = DefaultRuleParameter.Value;
+      DefaultRuleParameter.ValidValues.Clear();
+      IDefaultRuleOperator defaultdefaultRule = Problem.Operators.OfType<IDefaultRuleOperator>().FirstOrDefault();
+
+      foreach (IDefaultRuleOperator defaultRule in Problem.Operators.OfType<IDefaultRuleOperator>().OrderBy(x => x.Name))
+        DefaultRuleParameter.ValidValues.Add(defaultRule);
+
+      if (oldDefaultRule != null) {
+        IDefaultRuleOperator defaultRule = DefaultRuleParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldDefaultRule.GetType());
+        if (defaultRule != null) DefaultRuleParameter.Value = defaultRule;
+        else oldDefaultRule = null;
+      }
+      if (oldDefaultRule == null && defaultdefaultRule != null)
+        DefaultRuleParameter.Value = defaultdefaultRule;
+    }
     private void UpdateCrossovers() {
       ICrossover oldCrossover = CrossoverParameter.Value;

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3/GAssistMainLoop.cs

@@ -61 +61 @@
     public ValueLookupParameter<IOperator> MutatorParameter {
       get { return (ValueLookupParameter<IOperator>)Parameters["Mutator"]; }
+    }
+    public ValueLookupParameter<IOperator> DefaultRuleParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["DefaultRule"]; }
     }
     public ValueLookupParameter<IOperator> SpecialStagesParameter {
@@ -130 +133 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("PopulationSize", "The size of the population."));
       Parameters.Add(new ValueLookupParameter<IOperator>("ReinitializationProbabilityOperator", ""));
+      Parameters.Add(new ValueLookupParameter<IOperator>("DefaultRule", ""));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope which represents a population of solutions on which the genetic algorithm should be applied."));
       #endregion
@@ -138 +142 @@
       Placeholder analyzer1 = new Placeholder();
       Placeholder reinitializationProbabilityOperator = new Placeholder();
+      Placeholder defaultRuleOperator = new Placeholder();
       Placeholder selector = new Placeholder();
       SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
@@ -170 +175 @@
       analyzer1.OperatorParameter.ActualName = "Analyzer";
 
+      defaultRuleOperator.Name = "Default Rule Operator";
+      defaultRuleOperator.OperatorParameter.ActualName = DefaultRuleParameter.Name;
+
       reinitializationProbabilityOperator.Name = "Reinitialization Probability operator (placeholder)";
       reinitializationProbabilityOperator.OperatorParameter.ActualName = ReinitializationProbabilityOperatorParameter.Name;
@@ -229 +237 @@
       variableCreator.Successor = resultsCollector1;
       resultsCollector1.Successor = analyzer1;
-      analyzer1.Successor = reinitializationProbabilityOperator;
+      analyzer1.Successor = defaultRuleOperator;
+      defaultRuleOperator.Successor = reinitializationProbabilityOperator;
       reinitializationProbabilityOperator.Successor = selector;
       selector.Successor = subScopesProcessor1;
@@ -263 +272 @@
       comparator.Successor = analyzer2;
       analyzer2.Successor = conditionalBranch;
-      conditionalBranch.FalseBranch = reinitializationProbabilityOperator;
+      conditionalBranch.FalseBranch = defaultRuleOperator;
       conditionalBranch.TrueBranch = null;
       conditionalBranch.Successor = null;