Changeset 9467 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs

Timestamp:

05/08/13 14:12:00 (11 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/LearningClassifierSystemMainLoop.cs (modified) (7 diffs)

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;
-    //    }
-    //  }
-    //}
   }
 }