Changeset 5935


Ignore:
Timestamp:
04/03/11 00:53:16 (8 years ago)
Author:
abeham
Message:

#852

  • Renamed CurrentIteration to Iterations
Location:
trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs

    r5893 r5935  
    179179      randomCreator.Successor = variableCreator;
    180180
    181       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("CurrentIteration", new IntValue(0)));
     181      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
    182182      variableCreator.Successor = currentInertiaAssigner;
    183183
     
    300300      foreach (IDiscreteDoubleValueModifier updater in InertiaUpdaterParameter.ValidValues) {
    301301        updater.EndIndexParameter.ActualName = MaxIterationsParameter.Name;
    302         updater.EndIndexParameter.Hidden = true; 
     302        updater.EndIndexParameter.Hidden = true;
    303303        updater.StartIndexParameter.Value = new IntValue(0);
    304304        updater.StartIndexParameter.Hidden = true;
    305         updater.IndexParameter.ActualName = "CurrentIteration";
     305        updater.IndexParameter.ActualName = "Iterations";
    306306        updater.ValueParameter.ActualName = "CurrentInertia";
    307307        updater.StartValueParameter.Value = new DoubleValue(1);
  • trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimizationMainLoop.cs

    r5866 r5935  
    127127      UniformSubScopesProcessor evaluationProcessor = new UniformSubScopesProcessor();
    128128      Placeholder swarmUpdater = new Placeholder();
    129       IntCounter currentIterationCounter = new IntCounter();
    130       Comparator currentIterationComparator = new Comparator();
     129      IntCounter iterationsCounter = new IntCounter();
     130      Comparator iterationsComparator = new Comparator();
    131131      ConditionalBranch conditionalBranch = new ConditionalBranch();
    132132      Placeholder inertiaUpdaterPlaceholder = new Placeholder();
     
    177177      inertiaUpdaterPlaceholder.Name = "(Inertia Updater)";
    178178      inertiaUpdaterPlaceholder.OperatorParameter.ActualName = InertiaUpdaterParameter.ActualName;
    179       inertiaUpdaterPlaceholder.Successor = currentIterationCounter;
    180 
    181       currentIterationCounter.Name = "CurrentIteration++";
    182       currentIterationCounter.ValueParameter.ActualName = "CurrentIteration";
    183       currentIterationCounter.Successor = currentIterationComparator;
    184 
    185       currentIterationComparator.LeftSideParameter.ActualName = "CurrentIteration";
    186       currentIterationComparator.Comparison = new Comparison(ComparisonType.Less);
    187       currentIterationComparator.RightSideParameter.ActualName = "MaxIterations";
    188       currentIterationComparator.ResultParameter.ActualName = "ContinueIteration";
    189       currentIterationComparator.Successor = conditionalBranch;
     179      inertiaUpdaterPlaceholder.Successor = iterationsCounter;
     180
     181      iterationsCounter.Name = "Iterations++";
     182      iterationsCounter.ValueParameter.ActualName = "Iterations";
     183      iterationsCounter.Successor = iterationsComparator;
     184
     185      iterationsComparator.LeftSideParameter.ActualName = "Iterations";
     186      iterationsComparator.Comparison = new Comparison(ComparisonType.Less);
     187      iterationsComparator.RightSideParameter.ActualName = "MaxIterations";
     188      iterationsComparator.ResultParameter.ActualName = "ContinueIteration";
     189      iterationsComparator.Successor = conditionalBranch;
    190190
    191191      conditionalBranch.Name = "ContinueIteration?";
Note: See TracChangeset for help on using the changeset viewer.