Changeset 12223 for branches/ALPS

Timestamp:

03/18/15 16:02:27 (10 years ago)

Author:

pfleck

Message:

#2350 Fixed calculation of init phase duration.

Location:

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

Files:

• AlpsSsGeneticAlgorithmMainLoop.cs (modified) (4 diffs)
• RandomIntAssigner.cs (modified) (2 diffs)

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

@@ -80 +80 @@
       var setTargetIndedxToNextInit = new Assigner() { Name = "TargetIndex = NextInit" };
       var incrementNextInit = new IntCounter() { Name = "Incr. NextInit" };
-      var checkInitFinished = new Comparator() { Name = "DoInit = NextInit >= PopulationSize" };
+      var checkInitFinished = new Comparator() { Name = "DoInit = NextInit < LayerSize" };
       var workingScopeProcessor = new NamedSubScopeProcessor() { Name = "WorkingScope Processor" };
       var createRandomIndividual = new SolutionsCreator() { Name = "Create random Individual" };
@@ -96 +96 @@
       var reactivateInit = new Assigner() { Name = "DoInit = true" };
       var resetNextInit = new Assigner() { Name = "NextInit = 1" };
-      var resetTargetIndex = new Assigner() { Name = "TargetIndex = 0" };
+      var resetTargetIndex = new Assigner() { Name = "TargetIndex = MatingPoolSize" };
       var tryMoveUp = new AlpsSsMover() { Name = "Try Move Up" };
       var incrementEvaluations = new IntCounter() { Name = "Incr. EvaluatedSolutions" };
@@ -161 +161 @@
 
       checkInitFinished.LeftSideParameter.ActualName = "NextInit";
-      checkInitFinished.RightSideParameter.ActualName = "PopulationSize";
-      checkInitFinished.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
+      checkInitFinished.RightSideParameter.ActualName = "LayerSize";
+      checkInitFinished.Comparison = new Comparison(ComparisonType.Less);
       checkInitFinished.ResultParameter.ActualName = "DoInit";
       checkInitFinished.Successor = workingScopeProcessor;
@@ -217 +217 @@
 
       resetTargetIndex.LeftSideParameter.ActualName = "TargetIndex";
-      resetTargetIndex.RightSideParameter.Value = new IntValue(0);
+      resetTargetIndex.RightSideParameter.ActualName = "MatingPoolSize";
       resetTargetIndex.Successor = createRandomIndividual;
 

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

@@ -32 +32 @@
   [StorableClass]
   public class RandomIntAssigner : SingleSuccessorOperator, IStochasticOperator {
-    public LookupParameter<IItem> LeftSideParameter {
-      get { return (LookupParameter<IItem>)Parameters["LeftSide"]; }
+    public LookupParameter<IntValue> LeftSideParameter {
+      get { return (LookupParameter<IntValue>)Parameters["LeftSide"]; }
     }
     public ValueLookupParameter<IntValue> MinimumParameter {
@@ -52 +52 @@
     public RandomIntAssigner()
       : base() {
-      Parameters.Add(new LookupParameter<IItem>("LeftSide", "The parameter whose value gets assigned."));
+      Parameters.Add(new LookupParameter<IntValue>("LeftSide", "The parameter whose value gets assigned."));
       Parameters.Add(new ValueLookupParameter<IntValue>("Minimum", new IntValue(0)));
       Parameters.Add(new ValueLookupParameter<IntValue>("Maximum", new IntValue(10)));