Changeset 9342 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3/GAssist.cs

Timestamp:

04/05/13 13:12:54 (12 years ago)

Author:

sforsten

Message:

#1980:

• added be project Optimization.Operators.LCS
• added default rule strategies for GAssist

Location:

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3

Files:

• . (modified) (1 prop)
• GAssist.cs (modified) (8 diffs)

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

@@ -29 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Optimization.Operators.LCS;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -203 +204 @@
       Parameters.Add(new FixedValueParameter<PercentValue>("MergeProbability", "", new PercentValue(0.05)));
       Parameters.Add(new FixedValueParameter<PercentValue>("StartReinitializeProbability", "", new PercentValue(0.05)));
-      Parameters.Add(new FixedValueParameter<PercentValue>("EndReinitializeProbability", "", new PercentValue(0.0)));
+      Parameters.Add(new FixedValueParameter<PercentValue>("EndReinitializeProbability", "", new PercentValue(Double.Epsilon)));
       Parameters.Add(new FixedValueParameter<PercentValue>("OneProbability", "", new PercentValue(0.75)));
       Parameters.Add(new FixedValueParameter<IntValue>("MaximumNumberOfIntervals", "", new IntValue(5)));
@@ -248 +249 @@
       mainLoop.PopulationSizeParameter.ActualName = PopulationSizeParameter.Name;
       mainLoop.ResultsParameter.ActualName = "Results";
+      mainLoop.ReinitializationProbabilityOperatorParameter.ActualName = ReinitializeCurveOperatorParameter.Name;
 
       foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
@@ -259 +261 @@
       UpdateAnalyzers();
 
-      foreach (IDiscreteDoubleValueModifier op in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name))
+      foreach (IDiscreteDoubleValueModifier op in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name)) {
         ReinitializeCurveOperatorParameter.ValidValues.Add(op);
+      }
+      ReinitializeCurveOperatorParameter.Value = ReinitializeCurveOperatorParameter.ValidValues.First(x => x.GetType().Equals(typeof(LinearDiscreteDoubleValueModifier)));
       ParameterizeReinitializeCurveOperators();
 
@@ -295 +299 @@
       var splitOperator = new SplitOperator();
       splitOperator.ProbabilityParameter.ActualName = "SplitProbability";
+      //change
+      splitOperator.IndividualParameter.ActualName = "DecisionList";
       SpecialStages.Operators.Add(splitOperator);
       var mergeOperator = new MergeOperator();
       mergeOperator.ProbabilityParameter.ActualName = "MergeProbability";
+      //change
+      mergeOperator.IndividualParameter.ActualName = "DecisionList";
       SpecialStages.Operators.Add(mergeOperator);
       var reinitializeOperator = new ReinitializeOperator();
@@ -303 +311 @@
       reinitializeOperator.DiscretizersParameter.ActualName = "Discretizers";
       reinitializeOperator.OneProbabilityParameter.ActualName = "OneProbability";
+      //change
+      reinitializeOperator.IndividualParameter.ActualName = "DecisionList";
       SpecialStages.Operators.Add(reinitializeOperator);
       foreach (var op in SpecialStages.Operators) {
@@ -477 +487 @@
       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);
@@ -483 +495 @@
         if (mutator != null) MutatorParameter.Value = mutator;
       }
+      if (oldMutator == null && defaultMutator != null)
+        MutatorParameter.Value = defaultMutator;
     }
     private void UpdateAnalyzers() {