Changeset 12138 for branches

Timestamp:

03/05/15 13:35:38 (10 years ago)

Author:

pfleck

Message:

#2350

• Added the AlpsSsGeneticAlgorithmMainOperator.
• Changed some minor things.

Location:

branches/ALPS

Files:

• HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs (modified) (5 diffs)
• HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs (modified) (7 diffs)
• HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainOperator.cs (added)
• HeuristicLab.Algorithms.ALPS.SteadyState/3.3/HeuristicLab.Algorithms.ALPS.SteadyState-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.ALPS/3.3/Alps.cs (modified) (1 diff)

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

@@ -102 +102 @@
     #endregion
 
+    private AlpsSsGeneticAlgorithmMainLoop MainLoop {
+      get { return OperatorGraph.Iterate().OfType<AlpsSsGeneticAlgorithmMainLoop>().First(); }
+    }
+
     [StorableConstructor]
     private AlpsSsGeneticAlgorithm(bool deserializing)
@@ -160 +164 @@
       initializeAgeProcessor.Successor = initializeLayerPopulationSize;
 
-      initializeAge.CollectedValues.Add(new ValueParameter<IntValue>("Age", new IntValue(1)));
+      initializeAge.CollectedValues.Add(new ValueParameter<IntValue>("EvalsCreated", new IntValue(1)));
 
       initializeLayerPopulationSize.ValueParameter.ActualName = "LayerPopulationSize";
@@ -237 +241 @@
     }
     private void ParameterizeMainLoop() {
-      //MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
-      //MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
+      MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+      MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
       //MainLoop.MainOperator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
       //MainLoop.MainOperator.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
@@ -247 +251 @@
       foreach (var selector in SelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
-        // Explicit setting of NumberOfSelectedSubScopesParameter is not required anymore because the NumberOfSelectedSubScopesCalculator calculates it itself
-        //selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSize - Elites.Value)); 
+        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2);
         selector.NumberOfSelectedSubScopesParameter.Hidden = true;
         ParameterizeStochasticOperatorForLayer(selector);
@@ -272 +275 @@
     }
 
+    protected override void ParameterizeStochasticOperator(IOperator @operator) {
+      var stochasticOperator = @operator as IStochasticOperator;
+      if (stochasticOperator != null) {
+        stochasticOperator.RandomParameter.ActualName = "Random";
+        stochasticOperator.RandomParameter.Hidden = true;
+      }
+    }
     protected override void ParameterizeStochasticOperatorForLayer(IOperator @operator) {
       var stochasticOperator = @operator as IStochasticOperator;
       if (stochasticOperator != null) {
-        stochasticOperator.RandomParameter.ActualName = GlobalRandomCreator.Name;
+        stochasticOperator.RandomParameter.ActualName = "Random";
         stochasticOperator.RandomParameter.Hidden = true;
       }
     }
-
     #endregion
 

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
@@ -88 +90 @@
       var matingPoolSizeMin2 = new Comparator() { Name = "ValidParents = MatingPoolSize >= 2" };
       var validParentsBranch = new ConditionalBranch() { Name = "ValidParents?" };
-      var mainOperator = new EmptyOperator(); // TODO
+      var mainOperator = new AlpsSsGeneticAlgorithmMainOperator();
       var reactivateInit = new Assigner() { Name = "DoInit = true" };
       var resetNextIndex = new Assigner() { Name = "NextInit = 1" };
@@ -94 +96 @@
       var clearMatingPool = new SubScopesRemover() { Name = "Clear WorkingScope" };
       var tryMoveUp = new EmptyOperator() { Name = "Try Move Up" }; // TODO
-      var setNewIndividual = new EmptyOperator() { Name = "Set New Individual" };
+      var setNewIndividual = new EmptyOperator() { Name = "Set New Individual" }; // TODO
+      var incrIterations = new IntCounter() { Name = "Incr. Iterations" };
+      var analyzer = new Placeholder() { Name = "Analyzer (Placeholder)" };
       var iterationsComparator = new Comparator() { Name = "Iterations >= MaximumIterations" };
       var terminateBranch = new ConditionalBranch() { Name = "Terminate?" };
@@ -105 +109 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OpenLayers", new IntValue(1)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("TargetIndex", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations"));
       variableCreator.Successor = randomScopeProcessor;
 
@@ -176 +181 @@
       matingPoolSizeMin2.Successor = validParentsBranch;
 
+      validParentsBranch.ConditionParameter.ActualName = "ValidParents";
       validParentsBranch.TrueBranch = mainOperator;
       validParentsBranch.FalseBranch = reactivateInit;
@@ -195 +201 @@
       tryMoveUp.Successor = setNewIndividual;
 
-      setNewIndividual.Successor = iterationsComparator;
+      setNewIndividual.Successor = incrIterations;
+
+      incrIterations.ValueParameter.ActualName = "Iterations";
+      incrIterations.Increment = new IntValue(1);
+      incrIterations.Successor = analyzer;
+
+      analyzer.OperatorParameter.ActualName = "Analyzer";
+      analyzer.Successor = iterationsComparator;
 
       iterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
@@ -205 +218 @@
       terminateBranch.ConditionParameter.ActualName = "Terminate";
       terminateBranch.FalseBranch = randomScopeProcessor;
-
-
-    }
-
+    }
   }
 }

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/HeuristicLab.Algorithms.ALPS.SteadyState-3.3.csproj

@@ -136 +136 @@
     <Compile Include="AlpsSsGeneticAlgorithm.cs" />
     <Compile Include="AlpsSsGeneticAlgorithmMainLoop.cs" />
+    <Compile Include="AlpsSsGeneticAlgorithmMainOperator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Plugin.cs" />

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Alps.cs

@@ -309 +309 @@
       var stochasticOperator = @operator as IStochasticOperator;
       if (stochasticOperator != null) {
-        stochasticOperator.RandomParameter.ActualName = GlobalRandomCreator.RandomParameter.ActualName;
+        stochasticOperator.RandomParameter.ActualName = "GlobalRandom";
         stochasticOperator.RandomParameter.Hidden = true;
       }