Changeset 9467 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems

Timestamp:

05/08/13 14:12:00 (12 years ago)

Author:

sforsten

Message:

#1980:

• added ProportionalTournamentSelector for XCS
• fixed bug: if an initial population is created in XCS, the initial population also creates general classifier, not only specific ones
• merged r9204:9466 HeuristicLab.Core from trunk to branch

Location:

branches/LearningClassifierSystems

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystem.cs (modified) (8 diffs)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs (modified) (7 diffs)

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

@@ -118 +118 @@
       get { return (ValueParameter<IntValue>)Parameters["MaxIterations"]; }
     }
+    public IConstrainedValueParameter<ISelector> SelectorParameter {
+      get { return (IConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
+    }
     public IConstrainedValueParameter<ICrossover> CrossoverParameter {
       get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
@@ -213 +216 @@
       get { return FinalAnalyzerParameter.Value; }
       set { FinalAnalyzerParameter.Value = value; }
+    }
+    public ISelector Selector {
+      get { return SelectorParameter.Value; }
+      set { SelectorParameter.Value = value; }
     }
     public ICrossover Crossover {
@@ -254 +261 @@
       Parameters.Add(new ValueParameter<MultiAnalyzer>("FinalAnalyzer", "The operator used to analyze the last generation.", new MultiAnalyzer()));
       Parameters.Add(new ValueParameter<IntValue>("MaxIterations", "The maximum number of iterations.", new IntValue(1000)));
+      Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions."));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
       Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
@@ -276 +284 @@
       mainLoop.FinalAnalyzerParameter.ActualName = FinalAnalyzerParameter.Name;
       mainLoop.MaxIterationsParameter.ActualName = MaxIterationsParameter.Name;
+      mainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
       mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
       mainLoop.MutatorParameter.ActualName = MutatorParameter.Name;
@@ -303 +312 @@
         ParameterizeEvaluator(Problem.Evaluator);
         MainLoop.SetCurrentProblem(Problem);
+        UpdateSelectors();
         UpdateCrossovers();
         UpdateMutators();
         UpdateAnalyzers();
+        ParameterizeSelectors();
         ParameterizeManipulator();
       }
@@ -311 +322 @@
     }
 
-    private void ParameterizeManipulator() {
-      foreach (var op in Problem.Operators.OfType<IProbabilityMutatorOperator>()) {
-        op.ProbabilityParameter.ActualName = MutationProbabilityParameter.Name;
-      }
-    }
     protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
       ParameterizeEvaluator(Problem.Evaluator);
@@ -326 +332 @@
     }
     protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
+      UpdateSelectors();
       UpdateCrossovers();
       UpdateMutators();
       UpdateAnalyzers();
+      ParameterizeSelectors();
       ParameterizeManipulator();
       base.Problem_OperatorsChanged(sender, e);
     }
 
+    private void ParameterizeSelectors() {
+      foreach (ISelector selector in SelectorParameter.ValidValues) {
+        selector.CopySelected = new BoolValue(true);
+        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(4);
+        selector.NumberOfSelectedSubScopesParameter.Hidden = true;
+        ParameterizeStochasticOperator(selector);
+      }
+      if (Problem != null) {
+        foreach (IXCSSelector selector in SelectorParameter.ValidValues.OfType<IXCSSelector>()) {
+          selector.NumerosityParameter.ActualName = Problem.Evaluator.NumerosityParameter.ActualName;
+          selector.NumerosityParameter.Hidden = true;
+        }
+        foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
+          selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+          selector.MaximizationParameter.Hidden = true;
+          selector.QualityParameter.ActualName = Problem.Evaluator.FitnessParameter.ActualName;
+          selector.QualityParameter.Hidden = true;
+        }
+      }
+    }
+    private void ParameterizeManipulator() {
+      foreach (var op in Problem.Operators.OfType<IProbabilityMutatorOperator>()) {
+        op.ProbabilityParameter.ActualName = MutationProbabilityParameter.Name;
+      }
+    }
     private void ParameterizeEvaluator(IXCSEvaluator evaluator) {
       evaluator.ActualTimeParameter.ActualName = "Iteration";
@@ -339 +372 @@
       evaluator.PowerParameter.ActualName = PowerParameter.Name;
       evaluator.ErrorZeroParameter.ActualName = ErrorZeroParameter.Name;
+    }
+    private void ParameterizeStochasticOperator(IOperator op) {
+      IStochasticOperator stochasticOp = op as IStochasticOperator;
+      if (stochasticOp != null) {
+        stochasticOp.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
+        stochasticOp.RandomParameter.Hidden = true;
+      }
+    }
+
+    private void UpdateSelectors() {
+      ISelector oldSelector = SelectorParameter.Value;
+      SelectorParameter.ValidValues.Clear();
+      ISelector defaultSelector = Problem.Operators.OfType<IXCSSelector>().FirstOrDefault();
+      if (defaultSelector == null) {
+        defaultSelector = Problem.Operators.OfType<ISelector>().FirstOrDefault();
+      }
+
+      foreach (ISelector selector in Problem.Operators.OfType<ISelector>().OrderBy(x => x.Name))
+        SelectorParameter.ValidValues.Add(selector);
+
+      if (oldSelector != null) {
+        ISelector selector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
+        if (selector != null) SelectorParameter.Value = selector;
+        else oldSelector = null;
+      }
+      if (oldSelector == null && defaultSelector != null)
+        SelectorParameter.Value = defaultSelector;
     }
 

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

@@ -25 +25 @@
 using HeuristicLab.Encodings.ConditionActionEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
@@ -42 +41 @@
 
     #region Parameter Properties
-    public IConstrainedValueParameter<ISelector> SelectorParameter {
-      get { return (IConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
+    public ValueLookupParameter<IOperator> SelectorParameter {
+      get { return adaptedGeneticAlgorithmMainLoop.SelectorParameter; }
     }
     public ValueLookupParameter<PercentValue> CrossoverProbabilityParameter {
@@ -108 +107 @@
     private void Initialize() {
       #region Create parameters
-      Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction.", new ItemSet<ISelector>() { new ProportionalSelector() }, new ProportionalSelector()));
       Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
       XCSAfterCopyingParentOperator afterCopyingParents = new XCSAfterCopyingParentOperator();
@@ -273 +271 @@
       subsumptionSelector.CopySelected = new BoolValue(false);
 
-      SelectorParameter.Value.CopySelected = new BoolValue(true);
-      SelectorParameter.Value.NumberOfSelectedSubScopesParameter.Value = new IntValue(4);
-
       evaluator.Name = "Evaluator";
 
@@ -320 +315 @@
       afterCrossover.ParentAverageActionSetSizeParameter.ActualName = "AverageActionSetSize";
 
-      adaptedGeneticAlgorithmMainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
       adaptedGeneticAlgorithmMainLoop.RandomParameter.ActualName = "Random";
       adaptedGeneticAlgorithmMainLoop.MaximumGenerationsParameter.ActualName = "ZeroIntValue";
@@ -428 +422 @@
     }
 
-    private void ParameterizeStochasticOperator(IOperator op) {
-      IStochasticOperator stochasticOp = op as IStochasticOperator;
-      if (stochasticOp != null) {
-        stochasticOp.RandomParameter.ActualName = "Random";
-        stochasticOp.RandomParameter.Hidden = true;
-      }
-    }
-
     internal void SetCurrentProblem(IConditionActionProblem problem) {
       initialSolutionsCreator.SolutionCreatorParameter.ActualName = problem.SolutionCreatorParameter.Name;
@@ -485 +471 @@
       adaptedGeneticAlgorithmMainLoop.SetChildName(problem.ChildName);
     }
-    //private void ParameterizeSelectors() {
-    //  foreach (ISelector selector in SelectorParameter.ValidValues) {
-    //    selector.CopySelected = new BoolValue(true);
-    //    //set value by parameter!
-    //    selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(5);
-    //    selector.NumberOfSelectedSubScopesParameter.Hidden = true;
-    //    ParameterizeStochasticOperator(selector);
-    //  }
-    //  if (Problem != null) {
-    //    foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
-    //      selector.MaximizationParameter.Value = new BoolValue(true);
-    //      selector.MaximizationParameter.Hidden = true;
-    //      selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
-    //      selector.QualityParameter.Hidden = true;
-    //    }
-    //  }
-    //}
   }
 }