Changeset 5311

Timestamp:

01/17/11 16:50:15 (14 years ago)

Author:

mkofler

Message:

#852: Adjusted parameter modifiers as discussed in ticket.

Location:

branches/PSO/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3

Files:

• HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj (modified) (1 diff)
• IDiscreteDoubleMatrixModifier.cs (added)
• ParticleSwarmOptimization.cs (modified) (7 diffs)
• ValueModifierSelector.cs (deleted)
• VelocityBoundsModifier.cs (added)
• WeightedValueModifierSelector.cs (deleted)

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="IDiscreteDoubleMatrixModifier.cs" />
+    <Compile Include="VelocityBoundsModifier.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 {
+    public IDiscreteDoubleValueModifier OmegaUpdater {
       get { return OmegaUpdaterParameter.Value; }
       set { OmegaUpdaterParameter.Value = value; }
     }
-    public WeightedValueModifierSelector VelocityBoundsUpdater {
+    public IDiscreteDoubleMatrixModifier VelocityBoundsUpdater {
       get { return VelocityBoundsUpdaterParameter.Value; }
       set { VelocityBoundsUpdaterParameter.Value = value; }
@@ -101 +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"]; }
+    public OptionalConstrainedValueParameter<IDiscreteDoubleMatrixModifier> VelocityBoundsUpdaterParameter {
+      get { return (OptionalConstrainedValueParameter<IDiscreteDoubleMatrixModifier>)Parameters["VelocityBoundsUpdater"]; }
+    }
+    public OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier> OmegaUpdaterParameter {
+      get { return (OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["OmegaUpdater"]; }
     }
     #endregion
@@ -112 +112 @@
     [Storable]
     private BestAverageWorstQualityAnalyzer qualityAnalyzer;
-
-    //[Storable]
-    //private IDiscreteDoubleValueModifier omegaModifier;
     #endregion
 
@@ -122 +119 @@
       : base(original, cloner) {
       qualityAnalyzer = cloner.Clone(original.qualityAnalyzer);
-      //omegaModifier = cloner.Clone(original.omegaModifier);
     }
 
@@ -144 +140 @@
       //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())); 
+      Parameters.Add(new OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>("OmegaUpdater", "Updates the omega parameter"));
+      //Parameters.Add(new ValueParameter<MatrixValueModifierSelector>("VelocityBoundsUpdater", "Adjusts the velocity bounds", new MatrixValueModifierSelector())); 
+      Parameters.Add(new OptionalConstrainedValueParameter<IDiscreteDoubleMatrixModifier>("VelocityBoundsUpdater", "Adjusts the velocity bounds."));
       ParticleUpdaterParameter.ActualValue = ParticleUpdaterParameter.ValidValues.SingleOrDefault(v => v.GetType() == typeof(TotallyConnectedParticleUpdater));
       TopologyInitializerParameter.ActualValue = TopologyInitializerParameter.ValidValues.SingleOrDefault(v => v.GetType() == typeof(EmptyTopologyInitializer));
@@ -254 +251 @@
 
       InitializeAnalyzers();
-      InitializeUpdaters(); 
+      InitVelocityBoundsUpdater();
       UpdateAnalyzers();
+      UpdateOmegaUpdater();
+      InitOmegaUpdater();
     }
 
@@ -309 +308 @@
     }
 
-    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);
+    private void InitVelocityBoundsUpdater() {
+      foreach (IDiscreteDoubleMatrixModifier matrixOp in ApplicationManager.Manager.GetInstances<IDiscreteDoubleMatrixModifier>()) {
+        VelocityBoundsUpdaterParameter.ValidValues.Add(matrixOp);
+        matrixOp.ValueParameter.ActualName = VelocityBoundsParameter.Name;
+        matrixOp.EndIndexParameter.ActualName = MaxIterationsParameter.Name;
+        matrixOp.StartIndexParameter.Value = new IntValue(0);
+        matrixOp.IndexParameter.ActualName = "CurrentIteration";
+        matrixOp.EndValueParameter.Value = new DoubleValue(0);
+      }
+      VelocityBoundsUpdaterParameter.ValueChanged += new EventHandler(VelocityBoundsUpdaterParameter_ValueChanged);
+    }
+
+    void VelocityBoundsUpdaterParameter_ValueChanged(object sender, EventArgs e) {
+      if (VelocityBoundsParameter.Value != null) {
+        foreach (IDiscreteDoubleMatrixModifier matrixOp in VelocityBoundsUpdaterParameter.Value.ScalingOperatorParameter.ValidValues) {
+            matrixOp.ValueParameter.ActualName = VelocityBoundsUpdater.ScaleParameter.Name;
+            matrixOp.StartValueParameter.Value = new DoubleValue(VelocityBoundsUpdater.ScaleParameter.ActualValue.Value);
         }
+      }
+    }
+
+    private void InitOmegaUpdater() {
+      foreach (IDiscreteDoubleValueModifier updater in OmegaUpdaterParameter.ValidValues) {
+        updater.EndIndexParameter.ActualName = MaxIterationsParameter.Name;
+        updater.StartIndexParameter.Value = new IntValue(0);
+        updater.IndexParameter.ActualName = "CurrentIteration";
+        updater.ValueParameter.ActualName = OmegaParameter.Name;
+        updater.StartValueParameter.Value = new DoubleValue(1);
+        updater.EndValueParameter.Value = new DoubleValue(0);
+      }
+    }
+
+    private void UpdateOmegaUpdater() {
+      IDiscreteDoubleValueModifier oldOmegaUpdater = OmegaUpdater;
+      OmegaUpdaterParameter.ValidValues.Clear();
+      foreach (IDiscreteDoubleValueModifier updater in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name)) {
+        OmegaUpdaterParameter.ValidValues.Add(updater);
+      }
+      if (oldOmegaUpdater != null) {
+        IDiscreteDoubleValueModifier updater = OmegaUpdaterParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldOmegaUpdater.GetType());
+        if (updater != null) OmegaUpdaterParameter.Value = updater;
+      }
     }