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

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)
• Discretizer (deleted)
• GAssist.cs (modified) (8 diffs)
• GAssistMainLoop.cs (modified) (10 diffs)
• HeuristicLab.Algorithms.GAssist-3.3.csproj (modified) (2 diffs)
• Interfaces (deleted)
• Properties (modified) (1 prop)
• SpecialStage (deleted)

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() {

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

@@ -25 +25 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Optimization.Operators.LCS;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -84 +85 @@
     public ValueLookupParameter<IntValue> PopulationSizeParameter {
       get { return (ValueLookupParameter<IntValue>)Parameters["PopulationSize"]; }
+    }
+    public ValueLookupParameter<IOperator> ReinitializationProbabilityOperatorParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["ReinitializationProbabilityOperator"]; }
     }
     private ScopeParameter CurrentScopeParameter {
@@ -125 +129 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("EvaluatedSolutions", "The number of times solutions have been evaluated."));
       Parameters.Add(new ValueLookupParameter<IntValue>("PopulationSize", "The size of the population."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("ReinitializationProbabilityOperator", ""));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope which represents a population of solutions on which the genetic algorithm should be applied."));
       #endregion
@@ -132 +137 @@
       ResultsCollector resultsCollector1 = new ResultsCollector();
       Placeholder analyzer1 = new Placeholder();
+      Placeholder reinitializationProbabilityOperator = new Placeholder();
       Placeholder selector = new Placeholder();
       SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
@@ -138 +144 @@
       StochasticBranch stochasticBranchCrossover = new StochasticBranch();
       Placeholder crossover = new Placeholder();
+      RandomSelector randomSelector = new RandomSelector();
+      PreservingRightReducer preservingRightReducer = new PreservingRightReducer();
       StochasticBranch stochasticBranchMutator = new StochasticBranch();
       Placeholder mutator = new Placeholder();
@@ -162 +170 @@
       analyzer1.OperatorParameter.ActualName = "Analyzer";
 
+      reinitializationProbabilityOperator.Name = "Reinitialization Probability operator (placeholder)";
+      reinitializationProbabilityOperator.OperatorParameter.ActualName = ReinitializationProbabilityOperatorParameter.Name;
+
       selector.Name = "Selector";
       selector.OperatorParameter.ActualName = "Selector";
@@ -172 +183 @@
       crossover.Name = "Crossover";
       crossover.OperatorParameter.ActualName = "Crossover";
+
+      randomSelector.CopySelected.Value = true;
+      randomSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
 
       stochasticBranchMutator.ProbabilityParameter.ActualName = "MutationProbability";
@@ -215 +229 @@
       variableCreator.Successor = resultsCollector1;
       resultsCollector1.Successor = analyzer1;
-      analyzer1.Successor = selector;
+      analyzer1.Successor = reinitializationProbabilityOperator;
+      reinitializationProbabilityOperator.Successor = selector;
       selector.Successor = subScopesProcessor1;
       subScopesProcessor1.Operators.Add(new EmptyOperator());
@@ -224 +239 @@
       uniformSubScopesProcessor1.Successor = uniformSubScopesProcessor2;
       stochasticBranchCrossover.FirstBranch = crossover;
-      stochasticBranchCrossover.SecondBranch = null;
+      stochasticBranchCrossover.SecondBranch = randomSelector;
+      randomSelector.Successor = preservingRightReducer;
       stochasticBranchCrossover.Successor = stochasticBranchMutator;
       crossover.Successor = null;
+      preservingRightReducer.Successor = null;
       stochasticBranchMutator.FirstBranch = mutator;
       stochasticBranchMutator.SecondBranch = null;
@@ -246 +263 @@
       comparator.Successor = analyzer2;
       analyzer2.Successor = conditionalBranch;
-      conditionalBranch.FalseBranch = selector;
+      conditionalBranch.FalseBranch = reinitializationProbabilityOperator;
       conditionalBranch.TrueBranch = null;
       conditionalBranch.Successor = null;

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3/HeuristicLab.Algorithms.GAssist-3.3.csproj

@@ -96 +96 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Discretizer\UniformWidthDiscretizer.cs" />
-    <Compile Include="Interfaces\IDiscretizer.cs" />
-    <Compile Include="Interfaces\IGAssistIndividualCreator.cs" />
-    <Compile Include="Interfaces\IGAssistSpecialStage.cs" />
-    <Compile Include="Interfaces\IGAssistIndividual.cs" />
-    <Compile Include="SpecialStage\GAssistSpecialStageMultiOperator.cs" />
-    <Compile Include="SpecialStage\GAssistSpecialStageOperator.cs" />
-    <Compile Include="SpecialStage\MergeOperator.cs" />
-    <Compile Include="SpecialStage\ReinitializeOperator.cs" />
-    <Compile Include="SpecialStage\SplitOperator.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <None Include="Plugin.cs.frame" />
@@ -121 +111 @@
       <Name>HeuristicLab.Core-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators.LCS\3.3\HeuristicLab.Optimization.Operators.LCS-3.3.csproj">
+      <Project>{f2c6d3b0-bd4f-4747-b13e-b18e53a2a09d}</Project>
+      <Name>HeuristicLab.Optimization.Operators.LCS-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd
+</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.