Changeset 9392 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3/GAssistMainLoop.cs

Timestamp:

04/23/13 13:31:29 (11 years ago)

Author:

sforsten

Message:

#1980:

• several small bug fixes
• added windowing technique ILAS to GAssist
• GAssist and XCS work now with real-valued features
• severely improved the performance of XCS

Location:

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3

Files:

• . (modified) (1 prop)
• GAssistMainLoop.cs (modified) (6 diffs)

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj

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

@@ -61 +61 @@
     public ValueLookupParameter<IOperator> MutatorParameter {
       get { return (ValueLookupParameter<IOperator>)Parameters["Mutator"]; }
+    }
+    public ValueLookupParameter<IOperator> MDLIterationParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["MDLIteration"]; }
     }
     public ValueLookupParameter<IOperator> DefaultRuleParameter {
@@ -134 +137 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("ReinitializationProbabilityOperator", ""));
       Parameters.Add(new ValueLookupParameter<IOperator>("DefaultRule", ""));
+      Parameters.Add(new ValueLookupParameter<IOperator>("MDLIteration", ""));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope which represents a population of solutions on which the genetic algorithm should be applied."));
       #endregion
 
       #region Create operators
-      VariableCreator variableCreator = new VariableCreator();
       ResultsCollector resultsCollector1 = new ResultsCollector();
       Placeholder analyzer1 = new Placeholder();
+      Placeholder mdlIterationOperator = new Placeholder();
+      Placeholder defaultRuleOperator = new Placeholder();
       Placeholder reinitializationProbabilityOperator = new Placeholder();
-      Placeholder defaultRuleOperator = new Placeholder();
       Placeholder selector = new Placeholder();
       SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
@@ -167 +171 @@
       ConditionalBranch conditionalBranch = new ConditionalBranch();
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class GeneticAlgorithm expects this to be called Generations
-
       resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
       resultsCollector1.ResultsParameter.ActualName = "Results";
@@ -174 +176 @@
       analyzer1.Name = "Analyzer";
       analyzer1.OperatorParameter.ActualName = "Analyzer";
+
+      mdlIterationOperator.Name = "MDL Iteration Operator";
+      mdlIterationOperator.OperatorParameter.ActualName = MDLIterationParameter.Name;
 
       defaultRuleOperator.Name = "Default Rule Operator";
@@ -234 +239 @@
 
       #region Create operator graph
-      OperatorGraph.InitialOperator = variableCreator;
-      variableCreator.Successor = resultsCollector1;
+      OperatorGraph.InitialOperator = resultsCollector1;
       resultsCollector1.Successor = analyzer1;
-      analyzer1.Successor = defaultRuleOperator;
+      analyzer1.Successor = mdlIterationOperator;
+      mdlIterationOperator.Successor = defaultRuleOperator;
       defaultRuleOperator.Successor = reinitializationProbabilityOperator;
       reinitializationProbabilityOperator.Successor = selector;
@@ -272 +277 @@
       comparator.Successor = analyzer2;
       analyzer2.Successor = conditionalBranch;
-      conditionalBranch.FalseBranch = defaultRuleOperator;
+      conditionalBranch.FalseBranch = mdlIterationOperator;
       conditionalBranch.TrueBranch = null;
       conditionalBranch.Successor = null;

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj