Changeset 5935

Timestamp:

04/03/11 00:53:16 (13 years ago)

Author:

abeham

Message:

#852

• Renamed CurrentIteration to Iterations

Location:

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3

Files:

• ParticleSwarmOptimization.cs (modified) (2 diffs)
• ParticleSwarmOptimizationMainLoop.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs

@@ -179 +179 @@
       randomCreator.Successor = variableCreator;
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("CurrentIteration", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
       variableCreator.Successor = currentInertiaAssigner;
 
@@ -300 +300 @@
       foreach (IDiscreteDoubleValueModifier updater in InertiaUpdaterParameter.ValidValues) {
         updater.EndIndexParameter.ActualName = MaxIterationsParameter.Name;
-        updater.EndIndexParameter.Hidden = true; 
+        updater.EndIndexParameter.Hidden = true;
         updater.StartIndexParameter.Value = new IntValue(0);
         updater.StartIndexParameter.Hidden = true;
-        updater.IndexParameter.ActualName = "CurrentIteration";
+        updater.IndexParameter.ActualName = "Iterations";
         updater.ValueParameter.ActualName = "CurrentInertia";
         updater.StartValueParameter.Value = new DoubleValue(1);

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimizationMainLoop.cs

@@ -127 +127 @@
       UniformSubScopesProcessor evaluationProcessor = new UniformSubScopesProcessor();
       Placeholder swarmUpdater = new Placeholder();
-      IntCounter currentIterationCounter = new IntCounter();
-      Comparator currentIterationComparator = new Comparator();
+      IntCounter iterationsCounter = new IntCounter();
+      Comparator iterationsComparator = new Comparator();
       ConditionalBranch conditionalBranch = new ConditionalBranch();
       Placeholder inertiaUpdaterPlaceholder = new Placeholder();
@@ -177 +177 @@
       inertiaUpdaterPlaceholder.Name = "(Inertia Updater)";
       inertiaUpdaterPlaceholder.OperatorParameter.ActualName = InertiaUpdaterParameter.ActualName;
-      inertiaUpdaterPlaceholder.Successor = currentIterationCounter;
-
-      currentIterationCounter.Name = "CurrentIteration++";
-      currentIterationCounter.ValueParameter.ActualName = "CurrentIteration";
-      currentIterationCounter.Successor = currentIterationComparator;
-
-      currentIterationComparator.LeftSideParameter.ActualName = "CurrentIteration";
-      currentIterationComparator.Comparison = new Comparison(ComparisonType.Less);
-      currentIterationComparator.RightSideParameter.ActualName = "MaxIterations";
-      currentIterationComparator.ResultParameter.ActualName = "ContinueIteration";
-      currentIterationComparator.Successor = conditionalBranch;
+      inertiaUpdaterPlaceholder.Successor = iterationsCounter;
+
+      iterationsCounter.Name = "Iterations++";
+      iterationsCounter.ValueParameter.ActualName = "Iterations";
+      iterationsCounter.Successor = iterationsComparator;
+
+      iterationsComparator.LeftSideParameter.ActualName = "Iterations";
+      iterationsComparator.Comparison = new Comparison(ComparisonType.Less);
+      iterationsComparator.RightSideParameter.ActualName = "MaxIterations";
+      iterationsComparator.ResultParameter.ActualName = "ContinueIteration";
+      iterationsComparator.Successor = conditionalBranch;
 
       conditionalBranch.Name = "ContinueIteration?";