Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/09/11 13:46:14 (12 years ago)
Author:
epitzer
Message:

Set CurrentInertia inside operator graph and make sure all operators use it
Set default end value to epsilon instead of zero (#852)

File:
1 edited

Legend:

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

    r5643 r5645  
    4848    }
    4949    public IValueLookupParameter<DoubleValue> InertiaParameter {
    50       get { return (IValueLookupParameter<DoubleValue>)Parameters["Inertia"]; }
     50      get { return (IValueLookupParameter<DoubleValue>)Parameters["CurrentInertia"]; }
    5151    }
    5252    public IValueLookupParameter<DoubleValue> PersonalBestAttractionParameter {
     
    105105      Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
    106106
    107       Parameters.Add(new ValueLookupParameter<DoubleValue>("Inertia", "Inertia weight on a particle's movement (omega)."));
     107      Parameters.Add(new ValueLookupParameter<DoubleValue>("CurrentInertia", "Inertia weight on a particle's movement (omega)."));
    108108      Parameters.Add(new ValueLookupParameter<DoubleValue>("PersonalBestAttraction", "Weight for particle's pull towards its personal best soution (phi_p)."));
    109109      Parameters.Add(new ValueLookupParameter<DoubleValue>("NeighborBestAttraction", "Weight for pull towards the neighborhood best solution or global best solution in case of a totally connected topology (phi_g)."));
     
    141141      #region Create operator graph
    142142      OperatorGraph.InitialOperator = resultsCollector;
    143       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations", null, "CurrentIteration"));
    144       resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Current Inertia", null, "CurrentInertia"));
     143      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
     144      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("CurrentInertia"));
    145145      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions"));
    146146      resultsCollector.ResultsParameter.ActualName = "Results";
     
    170170      subScopesCounter.Name = "Increment EvaluatedSolutions";
    171171      subScopesCounter.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
    172       subScopesCounter.Successor = topologyUpdaterPlaceholder; 
     172      subScopesCounter.Successor = topologyUpdaterPlaceholder;
    173173
    174174      topologyUpdaterPlaceholder.Name = "(TopologyUpdater)";
Note: See TracChangeset for help on using the changeset viewer.