Changeset 9605 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist

Timestamp:

06/11/13 13:32:32 (11 years ago)

Author:

sforsten

Message:

#1980:

• set plugin dependencies
• added smart initialization
• added hierarchical selection
• fixed major and minor default rule
• fixed several smaller bugs
• some refactoring has been done

Location:

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3

Files:

• GAssist.cs (modified) (11 diffs)
• Plugin.cs.frame (modified) (1 diff)

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

@@ -201 +201 @@
       get { return (VariableCreator)RandomCreator.Successor; }
     }
+    private Placeholder InitialDefaultRuleExecution {
+      get { return (Placeholder)VariableCreator.Successor; }
+    }
     private Placeholder MDLIterationPlaceholder {
-      get { return (Placeholder)VariableCreator.Successor; }
+      get { return (Placeholder)InitialDefaultRuleExecution.Successor; }
     }
     private ILASOperator ILASOperator {
@@ -210 +213 @@
       get { return (InitializeDiscretizersOperator)ILASOperator.Successor; }
     }
-    private SolutionsCreator SolutionsCreator {
-      get { return (SolutionsCreator)InitializeDiscretizers.Successor; }
+    private NicheSolutionCreator SolutionsCreator {
+      get { return (NicheSolutionCreator)InitializeDiscretizers.Successor; }
     }
     private GAssistMainLoop GeneticAlgorithmMainLoop {
@@ -255 +258 @@
       RandomCreator randomCreator = new RandomCreator();
       VariableCreator variableCreator = new VariableCreator();
+      Placeholder initialDefaultRuleExecution = new Placeholder();
       Placeholder mdlIterationPlaceholder = new Placeholder();
       ILASOperator ilasOperator = new ILASOperator();
       InitializeDiscretizersOperator initializeDiscretizers = new InitializeDiscretizersOperator();
-      SolutionsCreator solutionsCreator = new SolutionsCreator();
+      NicheSolutionCreator solutionsCreator = new NicheSolutionCreator();
       SubScopesCounter subScopesCounter = new SubScopesCounter();
       ResultsCollector resultsCollector = new ResultsCollector();
@@ -272 +276 @@
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class GAssistMainLoop expects this to be called Generations
-      variableCreator.Successor = mdlIterationPlaceholder;
+      variableCreator.Successor = initialDefaultRuleExecution;
+
+      initialDefaultRuleExecution.Name = "Initial Default Rule Execution";
+      initialDefaultRuleExecution.OperatorParameter.ActualName = DefaultRuleParameter.Name;
+      initialDefaultRuleExecution.Successor = mdlIterationPlaceholder;
 
       mdlIterationPlaceholder.Name = "MDL Iteration Operator";
@@ -315 +323 @@
       foreach (INichingSingleObjectiveSelector selector in ApplicationManager.Manager.GetInstances<INichingSingleObjectiveSelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
         SelectorParameter.ValidValues.Add(selector);
-      //INichingSingleObjectiveSelector proportionalSelector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("ProportionalSelector"));
-      //if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
+
       ParameterizeSelectors();
 
@@ -369 +376 @@
       SpecialStages.Operators.Clear();
       var splitOperator = new SplitOperator();
-      splitOperator.ProbabilityParameter.ActualName = "SplitProbability";
+      splitOperator.ProbabilityParameter.ActualName = SplitProbabilityParameter.Name;
       //change
       splitOperator.IndividualParameter.ActualName = "DecisionList";
       SpecialStages.Operators.Add(splitOperator);
       var mergeOperator = new MergeOperator();
-      mergeOperator.ProbabilityParameter.ActualName = "MergeProbability";
+      mergeOperator.ProbabilityParameter.ActualName = MergeProbabilityParameter.Name;
       //change
       mergeOperator.IndividualParameter.ActualName = "DecisionList";
@@ -381 +388 @@
       reinitializeOperator.ProbabilityParameter.ActualName = "ReinitializeProbability";
       reinitializeOperator.DiscretizersParameter.ActualName = "Discretizers";
-      reinitializeOperator.OneProbabilityParameter.ActualName = "OneProbability";
+      reinitializeOperator.OneProbabilityParameter.ActualName = OneProbabilityParameter.Name;
       //change
       reinitializeOperator.IndividualParameter.ActualName = "DecisionList";
@@ -508 +515 @@
       SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
       SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
+      SolutionsCreator.GAssistNichesProblemDataParameter.ActualName = Problem.ProblemDataParameter.Name;
       // change!
-      ((IGAssistIndividualCreator)Problem.SolutionCreatorParameter.ActualValue).DiscretizersParameter.ActualName = "Discretizers";
+      ((IGAssistSolutionCreator)Problem.SolutionCreatorParameter.ActualValue).DiscretizersParameter.ActualName = "Discretizers";
     }
     private void ParameterizeGeneticAlgorithmMainLoop() {
@@ -536 +544 @@
         selector.ParentsPerChildParameter.Value = new IntValue(2);
         ParameterizeStochasticOperator(selector);
+        ParameterizeIterationBasedOperators(selector);
       }
       if (Problem != null) {
-        foreach (INichingSingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<INichingSingleObjectiveSelector>()) {
+        foreach (INichingSingleObjectiveSelector selector in SelectorParameter.ValidValues) {
           selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
           selector.MaximizationParameter.Hidden = true;
@@ -547 +556 @@
           //change
           selector.IndividualParameter.ActualName = "DecisionList";
+        }
+        foreach (IHierarchicalSingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<IHierarchicalSingleObjectiveSelector>()) {
+          selector.LengthParameter.ActualName = Problem.Evaluator.LengthParameter.ActualName;
         }
       }
@@ -595 +607 @@
         else oldDefaultRule = null;
       }
-      if (oldDefaultRule == null && defaultdefaultRule != null)
+      if (oldDefaultRule == null && defaultdefaultRule != null) {
         DefaultRuleParameter.Value = defaultdefaultRule;
+        SolutionsCreator.NichingParameter.ActualName = defaultdefaultRule.NichingParameter.ActualName;
+      }
     }
     private void UpdateCrossovers() {

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3/Plugin.cs.frame

@@ -25 +25 @@
   [Plugin("HeuristicLab.Algorithms.GAssist", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.Algorithms.GAssist-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
-  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Operators.LCS", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
+  [PluginDependency("HeuristicLab.Random", "3.3")]
+  [PluginDependency("HeuristicLab.Selection", "3.3")]
   public class HeuristicLabAlgorithmsGAssistPlugin : PluginBase {
   }