Changeset 9167 for branches/LearningClassifierSystems

Timestamp:

01/15/13 15:52:54 (12 years ago)

Author:

sforsten

Message:

#1980:

• change standard parameter settings in ConditionActionClassificationProblem
• fixed bug: if a parent is copied instead of a crossover, the new individual is inserted in the population correctly
• added missing attributes to ConditionActionClassificationProblemData

Location:

branches/LearningClassifierSystems

Files:

• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LCSAdaptedGeneticAlgorithm.cs (modified) (5 diffs)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs (modified) (5 diffs)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVector.cs (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/GA/XCSAfterCopyingParentOperator.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/GA/XCSAfterCrossoverOperator.cs (modified) (7 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/IClassifier.cs (modified) (1 diff)
• HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblemData.cs (modified) (1 diff)

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

@@ -54 +54 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["Selector"]; }
     }
+    public ValueLookupParameter<IOperator> AfterCopyingParentsParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["AfterCopyingParents"]; }
+    }
     public ValueLookupParameter<IOperator> CrossoverParameter {
       get { return (ValueLookupParameter<IOperator>)Parameters["Crossover"]; }
@@ -112 +115 @@
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Selector", "The operator used to select solutions for reproduction."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("AfterCopyingParents", "The operator executed after copying a parent instead of using crossover."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Crossover", "The operator used to cross solutions."));
       Parameters.Add(new ValueLookupParameter<IOperator>("AfterCrossover", "The operator executed after crossing the solutions."));
@@ -135 +139 @@
       RandomSelector randomSelector = new RandomSelector();
       PreservingRightReducer preservingRightReducer = new PreservingRightReducer();
-      Assigner numerosityAssigner = new Assigner();
-      Assigner experienceAssigner = new Assigner();
+      Placeholder afterCopyingParents = new Placeholder();
       Placeholder crossover = new Placeholder();
       Placeholder afterCrossover = new Placeholder();
@@ -182 +185 @@
       randomSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
 
+      afterCopyingParents.Name = "AfterCopyingParents";
+      afterCopyingParents.OperatorParameter.ActualName = "AfterCopyingParents";
+
       crossover.Name = "Crossover";
       crossover.OperatorParameter.ActualName = "Crossover";
-
-      numerosityAssigner.LeftSideParameter.ActualName = "Numerosity";
-      numerosityAssigner.RightSideParameter.Value = new IntValue(1);
-
-      experienceAssigner.LeftSideParameter.ActualName = "Experience";
-      experienceAssigner.RightSideParameter.Value = new IntValue(0);
 
       afterCrossover.Name = "AfterCrossover";
@@ -254 +254 @@
       crossoverStochasticBranch.SecondBranch = randomSelector;
       randomSelector.Successor = preservingRightReducer;
-      preservingRightReducer.Successor = numerosityAssigner;
-      numerosityAssigner.Successor = experienceAssigner;
-      experienceAssigner.Successor = null;
+      preservingRightReducer.Successor = afterCopyingParents;
       crossoverStochasticBranch.Successor = mutator;
       crossover.Successor = afterCrossover;

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

@@ -52 +52 @@
       get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
     }
+    public IConstrainedValueParameter<IOperator> AfterCopyingParentsParameter {
+      get { return (IConstrainedValueParameter<IOperator>)Parameters["AfterCopyingParents"]; }
+    }
     public IConstrainedValueParameter<IOperator> AfterCrossoverParameter {
       get { return (IConstrainedValueParameter<IOperator>)Parameters["AfterCrossover"]; }
@@ -101 +104 @@
       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));
       XCSAfterCrossoverOperator afterCrossover = new XCSAfterCrossoverOperator();
-      Parameters.Add(new ConstrainedValueParameter<IOperator>("AfterCrossover", "The operator used to select solutions for reproduction.", new ItemSet<IOperator>() { new XCSAfterCrossoverOperator() }, afterCrossover));
+      Parameters.Add(new ConstrainedValueParameter<IOperator>("AfterCrossover", "", new ItemSet<IOperator>() { new XCSAfterCrossoverOperator() }, afterCrossover));
       Parameters.Add(new LookupParameter<IntValue>("MaxIterations", "The maximum number of iterations the algorithm will do."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
       #endregion
-
-
-      //test
-      DataReducer testReducer = new DataReducer();
-      testReducer.TargetParameter.ActualName = "TestCurrentPopulation";
-      testReducer.ParameterToReduce.ActualName = "Numerosity";
-      testReducer.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum);
-      testReducer.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign);
 
       #region Create operators
@@ -315 +312 @@
       adaptedGeneticAlgorithmMainLoop.MaximizationParameter.Value = new BoolValue(true);
       adaptedGeneticAlgorithmMainLoop.AfterCrossoverParameter.ActualName = AfterCrossoverParameter.Name;
+      adaptedGeneticAlgorithmMainLoop.AfterCopyingParentsParameter.ActualName = AfterCopyingParentsParameter.Name;
 
       currentPopulationSizeCounter.ValueParameter.ActualName = "CurrentPopulationSize";
@@ -351 +349 @@
       initialPopulationConditionalBranch.Successor = maxIterationsComparator;
       maxIterationsComparator.Successor = terminationConditionalBranch1;
-      terminationConditionalBranch1.TrueBranch = finalAnalyzer;
+      //terminationConditionalBranch1.TrueBranch = finalAnalyzer;
       terminationConditionalBranch1.FalseBranch = classifierFetcher;
       classifierFetcher.Successor = matchCondtionSubScopesProcessor;
@@ -410 +408 @@
       //iterationCounter.Successor = maxIterationsComparator;
 
-      iterationCounter.Successor = testReducer;
-      testReducer.Successor = maxIterationsComparator;
+      iterationCounter.Successor = finalAnalyzer;
+      finalAnalyzer.Successor = maxIterationsComparator;
       #endregion
     }

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVector.cs

@@ -251 +251 @@
       return result.GetHashCode();
     }
+
+    public bool Identical(IClassifier classifier) {
+      var cast = classifier as CombinedIntegerVector;
+      if (cast != null) {
+        for (int i = 0; i < array.Length; i++) {
+          if (!array[i].Equals(cast.array[i])) {
+            return false;
+          }
+        }
+      }
+      return true;
+    }
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/GA/XCSAfterCrossoverOperator.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +30 @@
   [Item("XCSAfterCrossoverOperator", "Description missing")]
   [StorableClass]
-  public class XCSAfterCrossoverOperator : SingleSuccessorOperator {
+  public class XCSAfterCrossoverOperator : XCSAfterCopyingParentOperator {
 
     #region Parameter Properties
-    public IValueLookupParameter<IntValue> NumerosityParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Numerosity"]; }
-    }
-    public IValueLookupParameter<IntValue> ExperienceParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Experience"]; }
-    }
     public IValueLookupParameter<IntValue> TimestampParameter {
       get { return (IValueLookupParameter<IntValue>)Parameters["Timestamp"]; }
@@ -54 +47 @@
     public IValueLookupParameter<DoubleValue> FitnessParameter {
       get { return (IValueLookupParameter<DoubleValue>)Parameters["Fitness"]; }
-    }
-    public IValueLookupParameter<BoolValue> InsertInPopulationParameter {
-      get { return (IValueLookupParameter<BoolValue>)Parameters["InsertInPopulation"]; }
-    }
-    public IValueLookupParameter<IntValue> TempIDParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["TempID"]; }
     }
     public ILookupParameter<IntValue> CurrentIterationParameter {
@@ -85 +72 @@
     public XCSAfterCrossoverOperator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IntValue>("Numerosity"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Experience"));
       Parameters.Add(new ValueLookupParameter<IntValue>("Timestamp"));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("AverageActionSetSize"));
@@ -92 +77 @@
       Parameters.Add(new ValueLookupParameter<DoubleValue>("Error"));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("Fitness"));
-      Parameters.Add(new ValueLookupParameter<BoolValue>("InsertInPopulation"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("TempID"));
       Parameters.Add(new LookupParameter<IntValue>("CurrentIteration"));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("ParentAverageActionSetSize"));
@@ -105 +88 @@
 
     public override IOperation Apply() {
-      NumerosityParameter.ActualValue = new IntValue(1);
-      ExperienceParameter.ActualValue = new IntValue(0);
       TimestampParameter.ActualValue = new IntValue(CurrentIterationParameter.ActualValue.Value);
       var parentAverageActionSetSize = ParentAverageActionSetSizeParameter.ActualValue;
@@ -116 +97 @@
       ErrorParameter.ActualValue = new DoubleValue(0.25 * parentPrecisionError.Select(x => x.Value).Average());
       FitnessParameter.ActualValue = new DoubleValue(0.1 * parentFitness.Select(x => x.Value).Average());
-      InsertInPopulationParameter.ActualValue = new BoolValue(true);
-      TempIDParameter.ActualValue = new IntValue(-1);
       return base.Apply();
     }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj

@@ -97 +97 @@
     <Compile Include="Evaluators\IXCSEvaluator.cs" />
     <Compile Include="GA\InsertInPopulationOperator.cs" />
+    <Compile Include="GA\XCSAfterCopyingParentOperator.cs" />
     <Compile Include="GA\XCSAfterCrossoverOperator.cs" />
     <Compile Include="IClassifier.cs" />

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/IClassifier.cs

@@ -41 +41 @@
     bool Equals(object obj);
     int GetHashCode();
+
+    //test
+    bool Identical(IClassifier classifier);
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs

@@ -185 +185 @@
 
       Parameters.Add(new ValueParameter<ICoveringSolutionCreator>("CoveringSolutionCreator", "", coveringSolutionCreator));
-      Parameters.Add(new FixedValueParameter<PercentValue>("ChangeSymbolProbabilityInCovering", "", new PercentValue(0.5)));
+      Parameters.Add(new FixedValueParameter<PercentValue>("ChangeSymbolProbabilityInCovering", "", new PercentValue(0.33)));
 
       Parameters.Add(new ValueParameter<ActionSetSubsumptionOperator>(ActionSetSubsumptionOperatorParameterName, "", new ActionSetSubsumptionOperator()));

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblemData.cs

@@ -33 +33 @@
 
 namespace HeuristicLab.Problems.ConditionActionClassification {
+  [StorableClass]
+  [Item("ConditionActionClassificationProblemData", "A problem data for LCS.")]
   public class ConditionActionClassificationProblemData : ParameterizedNamedItem, IConditionActionProblemData {