Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/28/11 17:25:28 (14 years ago)
Author:
epitzer
Message:

Continue working on SwarmUpdater (#852)

Location:
trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r5561 r5568  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Encodings.RealVectorEncoding;
    2928using HeuristicLab.Operators;
    3029using HeuristicLab.Optimization;
    … …  
    7877      get { return (IValueParameter<DoubleValue>)Parameters["PersonalBestAttraction"]; }
    7978    }
    80     public IValueParameter<DoubleValue> NeighborsBestAttractionParameter {
    81       get { return (IValueParameter<DoubleValue>)Parameters["NeighborsBestAttraction"]; }
     79    public IValueParameter<DoubleValue> NeighborBestAttractionParameter {
     80      get { return (IValueParameter<DoubleValue>)Parameters["NeighborBestAttraction"]; }
    8281    }
    8382    public IValueParameter<MultiAnalyzer> AnalyzerParameter {
    … …  
    9998      get { return (OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["InertiaUpdater"]; }
    10099    }
     100    public ConstrainedValueParameter<ISwarmUpdater> SwarmUpdaterParameter {
     101      get { return (ConstrainedValueParameter<ISwarmUpdater>)Parameters["SwarmUpdater"]; }
     102
     103    }
    101104    #endregion
    102105
    … …  
    113116    [Storable]
    114117    private ParticleSwarmOptimizationMainLoop mainLoop;
    115 
    116     [Storable]
    117     private CombinedOperator swarmUpdater;
    118118
    119119    public ITopologyInitializer TopologyInitializer {
    … …  
    145145      solutionsCreator = cloner.Clone(original.solutionsCreator);
    146146      mainLoop = cloner.Clone(original.mainLoop);
    147       swarmUpdater = cloner.Clone(original.swarmUpdater);
    148147      Initialize();
    149148    }
    … …  
    157156      Parameters.Add(new ValueParameter<DoubleValue>("Inertia", "Inertia weight on a particle's movement (omega).", new DoubleValue(-0.2)));
    158157      Parameters.Add(new ValueParameter<DoubleValue>("PersonalBestAttraction", "Weight for particle's pull towards its personal best soution (phi_p).", new DoubleValue(-0.01)));
    159       Parameters.Add(new ValueParameter<DoubleValue>("NeighborsBestAttraction", "Weight for pull towards the neighborhood best solution or global best solution in case of a totally connected topology (phi_g).", new DoubleValue(3.7)));
     158      Parameters.Add(new ValueParameter<DoubleValue>("NeighborBestAttraction", "Weight for pull towards the neighborhood best solution or global best solution in case of a totally connected topology (phi_g).", new DoubleValue(3.7)));
    160159      Parameters.Add(new ConstrainedValueParameter<IParticleCreator>("ParticleCreator", "Operator creates a new particle."));
    161160      Parameters.Add(new ConstrainedValueParameter<IParticleUpdater>("ParticleUpdater", "Operator that updates a particle."));
    … …  
    163162      Parameters.Add(new OptionalConstrainedValueParameter<ITopologyUpdater>("TopologyUpdater", "Updates the neighborhood description vectors."));
    164163      Parameters.Add(new OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>("InertiaUpdater", "Updates the omega parameter."));
     164      Parameters.Add(new ConstrainedValueParameter<ISwarmUpdater>("SwarmUpdater", "Encoding-specific parameter which is provided by the problem. May provide additional encoding-specific parameters, such as velocity bounds for real valued problems"));
    165165
    166166      RandomCreator randomCreator = new RandomCreator();
    … …  
    168168      solutionsCreator = new SolutionsCreator();
    169169      Placeholder topologyInitializerPlaceholder = new Placeholder();
    170       ResultsCollector resultsCollector = new ResultsCollector();
    171170      Placeholder analyzerPlaceholder = new Placeholder();
    172       swarmUpdater = new CombinedOperator();
    173171      mainLoop = new ParticleSwarmOptimizationMainLoop();
    174172
    … …  
    183181
    184182      solutionsCreator.NumberOfSolutionsParameter.ActualName = "SwarmSize";
    185       ParameterizeSolutionsCreator(); 
    186       solutionsCreator.Successor = topologyInitializerPlaceholder; 
     183      ParameterizeSolutionsCreator();
     184      solutionsCreator.Successor = topologyInitializerPlaceholder;
    187185
    188186      topologyInitializerPlaceholder.Name = "(TopologyInitializer)";
    189187      topologyInitializerPlaceholder.OperatorParameter.ActualName = "TopologyInitializer";
    190       topologyInitializerPlaceholder.Successor = swarmUpdater;
    191 
    192       swarmUpdater.Successor = resultsCollector;
    193 
    194       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations", null, "CurrentIteration"));
    195       //resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Current Inertia", null, "Inertia"));
    196       //resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions"));
    197       resultsCollector.ResultsParameter.ActualName = "Results";
    198       resultsCollector.Successor = mainLoop;
     188      topologyInitializerPlaceholder.Successor = mainLoop;
    199189
    200190      mainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
    201191      mainLoop.InertiaParameter.ActualName = InertiaParameter.Name;
    202192      mainLoop.MaxIterationsParameter.ActualName = MaxIterationsParameter.Name;
    203       mainLoop.NeighborsBestAttractionParameter.ActualName = NeighborsBestAttractionParameter.Name;
     193      mainLoop.NeighborBestAttractionParameter.ActualName = NeighborBestAttractionParameter.Name;
    204194      mainLoop.InertiaUpdaterParameter.ActualName = InertiaUpdaterParameter.Name;
    205195      mainLoop.ParticleUpdaterParameter.ActualName = ParticleUpdaterParameter.Name;
    206196      mainLoop.PersonalBestAttractionParameter.ActualName = PersonalBestAttractionParameter.Name;
    207197      mainLoop.RandomParameter.ActualName = randomCreator.RandomParameter.ActualName;
    208       mainLoop.SwarmSizeParameter.ActualName = SwarmSizeParameter.Name; 
    209       mainLoop.TopologyUpdaterParameter.ActualName = TopologyUpdaterParameter.Name; 
     198      mainLoop.SwarmSizeParameter.ActualName = SwarmSizeParameter.Name;
     199      mainLoop.TopologyUpdaterParameter.ActualName = TopologyUpdaterParameter.Name;
    210200      mainLoop.RandomParameter.ActualName = randomCreator.RandomParameter.ActualName;
    211201      mainLoop.ResultsParameter.ActualName = "Results";
    212      // mainLoop.EvaluatedMovesParameter.ActualName = "EvaluatedMoves";
     202      // mainLoop.EvaluatedMovesParameter.ActualName = "EvaluatedMoves";
    213203
    214204      InitializeAnalyzers();
    … …  
    216206      InitializeParticleCreator();
    217207      InitializeSwarmUpdater();
    218       ParameterizeSolutionsCreator(); 
     208      ParameterizeSolutionsCreator();
    219209      UpdateAnalyzers();
    220210      UpdateInertiaUpdater();
    … …  
    222212      UpdateTopologyInitializer();
    223213      Initialize();
    224       ParameterizeMainLoop(); 
     214      ParameterizeMainLoop();
    225215    }
    226216
    … …  
    257247      InitializeParticleCreator();
    258248      InitializeSwarmUpdater();
    259       ParameterizeSolutionsCreator(); 
     249      ParameterizeSolutionsCreator();
    260250      base.OnProblemChanged();
    261251    }
    … …  
    290280          IParticleCreator creator = ParticleCreatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldParticleCreator.GetType());
    291281          if (creator != null) ParticleCreator = creator;
    292         } 
     282        }
    293283      }
    294284    }
    … …  
    400390
    401391    private void ParameterizeMainLoop() {
    402       if (Problem != null) { 
     392      if (Problem != null) {
    403393        mainLoop.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
    404394      }
    … …  
    408398      if (Problem != null) {
    409399        ISwarmUpdater updater = Problem.Operators.OfType<ISwarmUpdater>().FirstOrDefault();
    410         swarmUpdater.OperatorGraph.InitialOperator = updater;
     400        SwarmUpdaterParameter.ValidValues.Clear();
     401        SwarmUpdaterParameter.ValidValues.Add(updater);
     402        SwarmUpdaterParameter.Value = updater;
    411403      }
    412404    }

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

    r5566 r5568  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using HeuristicLab.Operators;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2822using HeuristicLab.Common;
    2923using HeuristicLab.Core;
     24using HeuristicLab.Data;
     25using HeuristicLab.Operators;
     26using HeuristicLab.Optimization;
     27using HeuristicLab.Optimization.Operators;
    3028using HeuristicLab.Parameters;
    31 using HeuristicLab.Data;
    32 using HeuristicLab.Analysis;
    33 using HeuristicLab.Optimization;
    34 using HeuristicLab.Random;
    35 using HeuristicLab.Optimization.Operators;
    36 using HeuristicLab.Encodings.RealVectorEncoding;
     29using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3730
    3831namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    … …  
    5952      get { return (IValueLookupParameter<DoubleValue>)Parameters["PersonalBestAttraction"]; }
    6053    }
    61     public IValueLookupParameter<DoubleValue> NeighborsBestAttractionParameter {
    62       get { return (IValueLookupParameter<DoubleValue>)Parameters["NeighborsBestAttraction"]; }
     54    public IValueLookupParameter<DoubleValue> NeighborBestAttractionParameter {
     55      get { return (IValueLookupParameter<DoubleValue>)Parameters["NeighborBestAttraction"]; }
    6356    }
    6457    public IValueLookupParameter<DoubleMatrix> VelocityBoundsParameter {
    6558      get { return (IValueLookupParameter<DoubleMatrix>)Parameters["VelocityBounds"]; }
    66     }                                     
     59    }
    6760    public IValueLookupParameter<IOperator> ParticleUpdaterParameter {
    6861      get { return (IValueLookupParameter<IOperator>)Parameters["ParticleUpdater"]; }
    … …  
    7467      get { return (IValueLookupParameter<IOperator>)Parameters["InertiaUpdater"]; }
    7568    }
    76     public IValueLookupParameter<VariableCollection> ResultsParameter {
    77       get { return (IValueLookupParameter<VariableCollection>)Parameters["Results"]; }
     69    public IValueLookupParameter<ResultCollection> ResultsParameter {
     70      get { return (IValueLookupParameter<ResultCollection>)Parameters["Results"]; }
    7871    }
    7972    public IValueLookupParameter<IOperator> EvaluatorParameter {
    8073      get { return (IValueLookupParameter<IOperator>)Parameters["Evaluator"]; }
    8174    }
     75    public ValueLookupParameter<ISwarmUpdater> SwarmUpdaterParameter {
     76      get { return (ValueLookupParameter<ISwarmUpdater>)Parameters["SwarmUpdater"]; }
     77    }
    8278    #endregion
    83                                                                  
     79
    8480    public ParticleSwarmOptimizationMainLoop()
    8581      : base() {
    … …  
    10298      Parameters.Add(new ValueLookupParameter<IntValue>("SwarmSize", "Size of the particle swarm.", new IntValue(10)));
    10399      Parameters.Add(new ValueLookupParameter<IntValue>("MaxIterations", "Maximal number of iterations.", new IntValue(1000)));
    104      
     100
    105101      Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
    106102
    107103      Parameters.Add(new ValueLookupParameter<DoubleValue>("Inertia", "Inertia weight on a particle's movement (omega)."));
    108104      Parameters.Add(new ValueLookupParameter<DoubleValue>("PersonalBestAttraction", "Weight for particle's pull towards its personal best soution (phi_p)."));
    109       Parameters.Add(new ValueLookupParameter<DoubleValue>("NeighborsBestAttraction", "Weight for pull towards the neighborhood best solution or global best solution in case of a totally connected topology (phi_g)."));
    110      
     105      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)."));
     106
    111107      Parameters.Add(new ValueLookupParameter<IOperator>("ParticleUpdater", "Operator that calculates new position and velocity of a particle"));
    112108      Parameters.Add(new ValueLookupParameter<IOperator>("TopologyUpdater", "Updates the neighborhood description vectors"));
    … …  
    114110      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "Evaluates a particle solution."));
    115111
    116       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
     112      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The variable collection where results should be stored."));
     113
     114      Parameters.Add(new ValueLookupParameter<ISwarmUpdater>("SwarmUpdater", "The encoding-specific swarm updater."));
    117115      #endregion
    118116
    119117      #region Create operators
     118      ResultsCollector resultsCollector = new ResultsCollector();
     119      Placeholder swarmUpdaterPlaceholer1 = new Placeholder();
    120120      Placeholder evaluatorPlaceholder = new Placeholder();
    121121      Placeholder analyzerPlaceholder = new Placeholder();
    … …  
    135135
    136136      #region Create operator graph
    137       OperatorGraph.InitialOperator = analyzerPlaceholder;
     137      OperatorGraph.InitialOperator = resultsCollector;
     138      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations", null, "CurrentIteration"));
     139      //resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Current Inertia", null, "Inertia"));
     140      //resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions"));
     141      resultsCollector.ResultsParameter.ActualName = "Results";
     142      resultsCollector.Successor = swarmUpdaterPlaceholer1;
     143
     144      swarmUpdaterPlaceholer1.Name = "(Swarm Updater)";
     145      swarmUpdaterPlaceholer1.OperatorParameter.ActualName = SwarmUpdaterParameter.ActualName;
     146      swarmUpdaterPlaceholer1.Successor = analyzerPlaceholder;
    138147
    139148      analyzerPlaceholder.Name = "(Analyzer)";
    140       analyzerPlaceholder.OperatorParameter.ActualName = AnalyzerParameter.Name; 
     149      analyzerPlaceholder.OperatorParameter.ActualName = AnalyzerParameter.Name;
    141150      analyzerPlaceholder.Successor = uniformSubScopeProcessor;
    142151
    … …  
    145154
    146155      particleUpdaterPlaceholder.Name = "(ParticleUpdater)";
    147       particleUpdaterPlaceholder.OperatorParameter.ActualName = ParticleUpdaterParameter.Name; 
     156      particleUpdaterPlaceholder.OperatorParameter.ActualName = ParticleUpdaterParameter.Name;
    148157
    149158      evaluationProcessor.Parallel = new BoolValue(true);
    … …  
    152161
    153162      evaluatorPlaceholder.Name = "(Evaluator)";
    154       evaluatorPlaceholder.OperatorParameter.ActualName = EvaluatorParameter.Name; 
     163      evaluatorPlaceholder.OperatorParameter.ActualName = EvaluatorParameter.Name;
    155164
    156165      topologyUpdaterPlaceholder.Name = "(TopologyUpdater)";
    157       topologyUpdaterPlaceholder.OperatorParameter.ActualName = TopologyUpdaterParameter.Name; 
     166      topologyUpdaterPlaceholder.OperatorParameter.ActualName = TopologyUpdaterParameter.Name;
    158167      topologyUpdaterPlaceholder.Successor = swarmUpdater;
    159168
    160169      swarmUpdater.Name = "Swarm Updater";
    161       swarmUpdater.OperatorParameter.ActualName = "SwarmUpdater";
    162       swarmUpdater.Successor = currentIterationCounter;
     170      swarmUpdater.OperatorParameter.ActualName = SwarmUpdaterParameter.ActualName;
     171      swarmUpdater.Successor = inertiaUpdaterPlaceholder;
     172
     173      inertiaUpdaterPlaceholder.Name = "(Inertia Updater)";
     174      inertiaUpdaterPlaceholder.OperatorParameter.ActualName = InertiaUpdaterParameter.ActualName;
     175      inertiaUpdaterPlaceholder.Successor = currentIterationCounter;
    163176
    164177      currentIterationCounter.Name = "CurrentIteration++";
    165178      currentIterationCounter.ValueParameter.ActualName = "CurrentIteration";
    166       currentIterationCounter.Successor = inertiaUpdaterPlaceholder;
    167 
    168       inertiaUpdaterPlaceholder.Name = "(Inertia Updater)";
    169       inertiaUpdaterPlaceholder.OperatorParameter.ActualName = InertiaUpdaterParameter.ActualName;
    170       inertiaUpdaterPlaceholder.Successor = currentIterationComparator;
     179      currentIterationCounter.Successor = currentIterationComparator;
    171180
    172181      currentIterationComparator.LeftSideParameter.ActualName = "CurrentIteration";
Note: See TracChangeset for help on using the changeset viewer.