Changeset 5225 for branches

Timestamp:

01/05/11 16:01:31 (14 years ago)

Author:

mkofler

Message:

#852: Added two parameter updaters (for omega and the velocity bounds)

Location:

branches/PSO/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3

Files:

• HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj (modified) (1 diff)
• ParticleSwarmOptimization.cs (modified) (9 diffs)
• ValueModifierSelector.cs (added)
• WeightedValueModifierSelector.cs (added)

branches/PSO/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj

@@ -110 +110 @@
   <ItemGroup>
     <Compile Include="BestPointInitializer.cs" />
+    <Compile Include="WeightedValueModifierSelector.cs" />
+    <Compile Include="ValueModifierSelector.cs" />
     <Compile Include="RandomTopologyInitializer.cs" />
     <Compile Include="VonNeumannTopologyInitializer.cs" />

branches/PSO/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs

@@ -54 +54 @@
       set { AnalyzerParameter.Value = value; }
     }
+    public ValueModifierSelector OmegaUpdater {
+      get { return OmegaUpdaterParameter.Value; }
+      set { OmegaUpdaterParameter.Value = value; }
+    }
+    public WeightedValueModifierSelector VelocityBoundsUpdater {
+      get { return VelocityBoundsUpdaterParameter.Value; }
+      set { VelocityBoundsUpdaterParameter.Value = value; }
+    }
     #endregion
 
@@ -93 +101 @@
       get { return (ConstrainedValueParameter<ITopologyUpdater>)Parameters["TopologyUpdater"]; }
     }
+    public ValueParameter<WeightedValueModifierSelector> VelocityBoundsUpdaterParameter {
+      get { return (ValueParameter<WeightedValueModifierSelector>)Parameters["VelocityBoundsUpdater"]; }
+    }
+    public ValueParameter<ValueModifierSelector> OmegaUpdaterParameter {
+      get { return (ValueParameter<ValueModifierSelector>)Parameters["OmegaUpdater"]; }
+    }
     #endregion
 
@@ -98 +112 @@
     [Storable]
     private BestAverageWorstQualityAnalyzer qualityAnalyzer;
+
+    //[Storable]
+    //private IDiscreteDoubleValueModifier omegaModifier;
     #endregion
 
@@ -105 +122 @@
       : base(original, cloner) {
       qualityAnalyzer = cloner.Clone(original.qualityAnalyzer);
+      //omegaModifier = cloner.Clone(original.omegaModifier);
     }
 
@@ -124 +142 @@
       Parameters.Add(new ConstrainedValueParameter<ITopologyUpdater>("TopologyUpdater", "Updates the neighborhood description vectors",
         new ItemSet<ITopologyUpdater>(ApplicationManager.Manager.GetInstances<ITopologyUpdater>())));
+      //Parameters.Add(new ValueParameter<MultiParameterUpdater>("ParameterUpdater", "Updates the algorithm parameters according to some strategy",
+      //  new MultiParameterUpdater()));
+      Parameters.Add(new ValueParameter<ValueModifierSelector>("OmegaUpdater", "Updates the omega parameter", new ValueModifierSelector())); 
+      Parameters.Add(new ValueParameter<WeightedValueModifierSelector>("VelocityBoundsUpdater", "Adjusts the velocity bounds", new WeightedValueModifierSelector())); 
       ParticleUpdaterParameter.ActualValue = ParticleUpdaterParameter.ValidValues.SingleOrDefault(v => v.GetType() == typeof(TotallyConnectedParticleUpdater));
       TopologyInitializerParameter.ActualValue = TopologyInitializerParameter.ValidValues.SingleOrDefault(v => v.GetType() == typeof(EmptyTopologyInitializer));
-      TopologyUpdaterParameter.ActualValue = TopologyUpdaterParameter.ValidValues.SingleOrDefault(v => v.GetType() == typeof(IdentityTopologyUpdater));
 
       RandomCreator randomCreator = new RandomCreator();
@@ -149 +170 @@
       Comparator currentIterationComparator = new Comparator();
       ConditionalBranch conditionalBranch = new ConditionalBranch();
+      Placeholder velocityBoundsUpdaterPlaceholder = new Placeholder();
+      Placeholder omegaUpdaterPlaceholder = new Placeholder();
 
       OperatorGraph.InitialOperator = randomCreator;
@@ -210 +233 @@
       currentIterationCounter.Name = "CurrentIteration++";
       currentIterationCounter.ValueParameter.ActualName = "CurrentIteration";
-      currentIterationCounter.Successor = currentIterationComparator;
+      currentIterationCounter.Successor = omegaUpdaterPlaceholder;
+
+      omegaUpdaterPlaceholder.Name = "(Omega Updater)";
+      omegaUpdaterPlaceholder.OperatorParameter.ActualName = "OmegaUpdater";
+      omegaUpdaterPlaceholder.Successor = velocityBoundsUpdaterPlaceholder;
+
+      velocityBoundsUpdaterPlaceholder.Name = "(Velocity Bounds Updater)";
+      velocityBoundsUpdaterPlaceholder.OperatorParameter.ActualName = "VelocityBoundsUpdater";
+      velocityBoundsUpdaterPlaceholder.Successor = currentIterationComparator;
 
       currentIterationComparator.LeftSideParameter.ActualName = "CurrentIteration";
@@ -223 +254 @@
 
       InitializeAnalyzers();
+      InitializeUpdaters(); 
       UpdateAnalyzers();
     }
@@ -275 +307 @@
       qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
       ParameterizeAnalyzers();
+    }
+
+    private void InitializeUpdaters() {
+      OmegaUpdater.ValueParameter.ActualName = OmegaParameter.Name;
+      foreach (IDiscreteDoubleValueModifier op in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>()) {
+        OmegaUpdater.ModifierParameter.ValidValues.Add(op);
+        op.EndIndexParameter.ActualName = MaxIterationsParameter.Name;
+        op.StartIndexParameter.Value = new IntValue(0);
+        op.IndexParameter.ActualName = "CurrentIteration";
+        op.ValueParameter.ActualName = OmegaUpdater.ValueParameter.ActualName;
+        op.StartValueParameter.Value = new DoubleValue(OmegaParameter.Value.Value);
+        op.EndValueParameter.Value = new DoubleValue(-2);
+      }
+      VelocityBoundsUpdater.ValueParameter.ActualName = VelocityBoundsParameter.Name;
+      foreach (IDiscreteDoubleValueModifier op in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>()) {
+        VelocityBoundsUpdater.ModifierParameter.ValidValues.Add(op);
+        op.EndIndexParameter.ActualName = MaxIterationsParameter.Name;
+        op.StartIndexParameter.Value = new IntValue(0);
+        op.IndexParameter.ActualName = "CurrentIteration";
+        op.ValueParameter.ActualName = VelocityBoundsUpdater.ScaleParameter.Name;
+        op.StartValueParameter.Value = new DoubleValue(VelocityBoundsUpdater.ScaleParameter.Value.Value);
+        op.EndValueParameter.Value = new DoubleValue(0);
+        }
     }