Changeset 9204 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3

Timestamp:

02/04/13 16:16:38 (12 years ago)

Author:

sforsten

Message:

#1980:

• deleted not needed interface IMatching
• finished VariableVector encoding
• the algorithm LearningClassifierSystem is now independent of a specific encoding. It still needs the ConditionActionEncoding.
• merged r9191:9203 HeuristicLab.Core from trunk to branch

Location:

branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3

Files:

• LearningClassifierSystem.cs (modified) (7 diffs)
• LearningClassifierSystemMainLoop.cs (modified) (7 diffs)

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

@@ -118 +118 @@
       get { return (ValueParameter<IntValue>)Parameters["MaxIterations"]; }
     }
+    public IConstrainedValueParameter<ICrossover> CrossoverParameter {
+      get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
+    }
+    public IConstrainedValueParameter<IManipulator> MutatorParameter {
+      get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
+    }
     #endregion
 
@@ -204 +210 @@
       get { return FinalAnalyzerParameter.Value; }
       set { FinalAnalyzerParameter.Value = value; }
+    }
+    public ICrossover Crossover {
+      get { return CrossoverParameter.Value; }
+      set { CrossoverParameter.Value = value; }
+    }
+    public IManipulator Mutator {
+      get { return MutatorParameter.Value; }
+      set { MutatorParameter.Value = value; }
     }
     private RandomCreator RandomCreator {
@@ -237 +251 @@
       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<ICrossover>("Crossover", "The operator used to cross solutions."));
+      Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
       #endregion
 
@@ -256 +272 @@
       mainLoop.FinalAnalyzerParameter.ActualName = FinalAnalyzerParameter.Name;
       mainLoop.MaxIterationsParameter.ActualName = MaxIterationsParameter.Name;
+      mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
+      mainLoop.MutatorParameter.ActualName = MutatorParameter.Name;
+      mainLoop.CrossoverProbabilityParameter.ActualName = CrossoverProbabilityParameter.Name;
       #endregion
 
@@ -279 +298 @@
         ParameterizeEvaluator(Problem.Evaluator);
         MainLoop.SetCurrentProblem(Problem);
+        UpdateCrossovers();
+        UpdateMutators();
         UpdateAnalyzers();
+        ParameterizeManipulator();
       }
       base.OnProblemChanged();
+    }
+
+    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) {
@@ -293 +321 @@
     }
     protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
+      UpdateCrossovers();
+      UpdateMutators();
       UpdateAnalyzers();
+      ParameterizeManipulator();
       base.Problem_OperatorsChanged(sender, e);
     }
@@ -305 +336 @@
     }
 
+    private void UpdateCrossovers() {
+      ICrossover oldCrossover = CrossoverParameter.Value;
+      CrossoverParameter.ValidValues.Clear();
+      ICrossover defaultCrossover = Problem.Operators.OfType<ICrossover>().FirstOrDefault();
+
+      foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name))
+        CrossoverParameter.ValidValues.Add(crossover);
+
+      if (oldCrossover != null) {
+        ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
+        if (crossover != null) CrossoverParameter.Value = crossover;
+        else oldCrossover = null;
+      }
+      if (oldCrossover == null && defaultCrossover != null)
+        CrossoverParameter.Value = defaultCrossover;
+    }
+    private void UpdateMutators() {
+      IManipulator oldMutator = MutatorParameter.Value;
+      MutatorParameter.ValidValues.Clear();
+      IManipulator defaultMutator = Problem.Operators.OfType<IManipulator>().FirstOrDefault();
+
+      foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name))
+        MutatorParameter.ValidValues.Add(mutator);
+      if (oldMutator != null) {
+        IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());
+        if (mutator != null) MutatorParameter.Value = mutator;
+        else oldMutator = null;
+      }
+      if (oldMutator == null && defaultMutator != null)
+        MutatorParameter.Value = defaultMutator;
+    }
     private void UpdateAnalyzers() {
       Analyzer.Operators.Clear();

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

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.CombinedIntegerVectorEncoding;
 using HeuristicLab.Encodings.ConditionActionEncoding;
 using HeuristicLab.Operators;
@@ -46 +45 @@
       get { return (IConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
     }
-    public IConstrainedValueParameter<ICrossover> CrossoverParameter {
-      get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
-    }
-    public IConstrainedValueParameter<IManipulator> MutatorParameter {
-      get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
+    public ValueLookupParameter<PercentValue> CrossoverProbabilityParameter {
+      get { return adaptedGeneticAlgorithmMainLoop.CrossoverProbabilityParameter; }
+    }
+    public ValueLookupParameter<IOperator> CrossoverParameter {
+      get { return adaptedGeneticAlgorithmMainLoop.CrossoverParameter; }
+    }
+    public ValueLookupParameter<IOperator> MutatorParameter {
+      get { return adaptedGeneticAlgorithmMainLoop.MutatorParameter; }
     }
     public IConstrainedValueParameter<IOperator> AfterCopyingParentsParameter {
@@ -78 +80 @@
     private CountNumberOfUniqueActions countNumberOfUniqueActions;
 
-    private UniformSomePositionManipulator test;
+    private LCSAdaptedGeneticAlgorithm adaptedGeneticAlgorithmMainLoop;
 
     private Placeholder evaluator;
@@ -102 +104 @@
       #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 ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions.", new ItemSet<ICrossover>() { new HeuristicLab.Encodings.CombinedIntegerVectorEncoding.SinglePointCrossover() }, new HeuristicLab.Encodings.CombinedIntegerVectorEncoding.SinglePointCrossover()));
       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."));
-      test = new UniformSomePositionManipulator();
-      test.ProbabilityParameter.ActualName = "MutationProbability";
-      test.ChildParameter.ActualName = "CombinedIntegerVector";
-      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.", new ItemSet<IManipulator>() { new UniformSomePositionManipulator() }, test));
       XCSAfterCopyingParentOperator afterCopyingParents = new XCSAfterCopyingParentOperator();
       Parameters.Add(new ConstrainedValueParameter<IOperator>("AfterCopyingParents", "", new ItemSet<IOperator>() { new XCSAfterCopyingParentOperator() }, afterCopyingParents));
@@ -162 +159 @@
       UniformSubScopesProcessor timestampAssignerSubscopeProcessor = new UniformSubScopesProcessor();
       Assigner timestampAssigner = new Assigner();
-      LCSAdaptedGeneticAlgorithm adaptedGeneticAlgorithmMainLoop = new LCSAdaptedGeneticAlgorithm();
+      adaptedGeneticAlgorithmMainLoop = new LCSAdaptedGeneticAlgorithm();
       IntCounter currentPopulationSizeCounter = new IntCounter();
       CalculateNumberOfDeletionsOperator calculateNumberOfDeletions = new CalculateNumberOfDeletionsOperator();
@@ -313 +310 @@
 
       adaptedGeneticAlgorithmMainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
-      adaptedGeneticAlgorithmMainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
-      adaptedGeneticAlgorithmMainLoop.MutatorParameter.ActualName = MutatorParameter.Name;
       adaptedGeneticAlgorithmMainLoop.RandomParameter.ActualName = "Random";
       adaptedGeneticAlgorithmMainLoop.MaximumGenerationsParameter.ActualName = "ZeroIntValue";
@@ -440 +435 @@
       classifierFetcher.OperatorParameter.ActualName = problem.ClassifierFetcherParameter.Name;
 
-      test.FetchedConditionParameter.ActualName = problem.ClassifierFetcher.CurrentInputToMatchParameter.ActualName;
-      test.PossibleActionsParameter.ActualName = problem.PossibleActionsConcreteClassParameter.Name;
-
       actionExecuter.OperatorParameter.ActualName = problem.ActionExecuterParameter.Name;