Changeset 5645 for trunk/sources

Timestamp:

03/09/11 13:46:14 (14 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)

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified) (6 diffs)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimizationMainLoop.cs (modified) (4 diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorParticleUpdater.cs (modified) (2 diffs)

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

@@ -166 +166 @@
       RandomCreator randomCreator = new RandomCreator();
       VariableCreator variableCreator = new VariableCreator();
+      Assigner assigner = new Assigner();
       solutionsCreator = new SolutionsCreator();
       SubScopesCounter subScopesCounter = new SubScopesCounter();
@@ -180 +181 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("CurrentIteration", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("CurrentVelocityBounds", new DoubleValue(0)));
-      variableCreator.Successor = solutionsCreator;
+      variableCreator.Successor = assigner;
+
+      assigner.Name = "CurrentInertia := Inertia";
+      assigner.LeftSideParameter.ActualName = "CurrentInertia";
+      assigner.RightSideParameter.ActualName = "Inertia";
+      assigner.Successor = solutionsCreator;
 
       solutionsCreator.NumberOfSolutionsParameter.ActualName = "SwarmSize";
@@ -195 +201 @@
 
       mainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
-      mainLoop.InertiaParameter.ActualName = InertiaParameter.Name;
+      mainLoop.InertiaParameter.ActualName = "CurrentInertia";
       mainLoop.MaxIterationsParameter.ActualName = MaxIterationsParameter.Name;
       mainLoop.NeighborBestAttractionParameter.ActualName = NeighborBestAttractionParameter.Name;
@@ -231 +237 @@
       if (Problem != null && ParticleCreator != null && ParticleUpdater != null) {
         base.Prepare();
-        VariableCreator creator = (VariableCreator)((RandomCreator)OperatorGraph.InitialOperator).Successor;
-        ValueParameter<DoubleValue> currentInertia = null; 
-        if (creator.CollectedValues.ContainsKey("CurrentInertia")) {
-          currentInertia = (ValueParameter<DoubleValue>) creator.CollectedValues["CurrentInertia"]; 
-        } else {
-          currentInertia = new ValueParameter<DoubleValue>("CurrentInertia");
-          creator.CollectedValues.Add(currentInertia); 
-        }
-        currentInertia.ActualValue = InertiaParameter.ActualValue; 
       }
     }
@@ -257 +254 @@
       this.UpdateTopologyParameters();
     }
-
-    //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);
-    //    }
-    //  }
-    //}
     #endregion
 
@@ -315 +303 @@
         updater.StartIndexParameter.Value = new IntValue(0);
         updater.IndexParameter.ActualName = "CurrentIteration";
-        updater.ValueParameter.ActualName = "CurrentInertia"; 
+        updater.ValueParameter.ActualName = "CurrentInertia";
         updater.StartValueParameter.Value = new DoubleValue(1);
-        updater.EndValueParameter.Value = new DoubleValue(0);
+        updater.EndValueParameter.Value = new DoubleValue(double.Epsilon);
       }
     }

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

@@ -48 +48 @@
     }
     public IValueLookupParameter<DoubleValue> InertiaParameter {
-      get { return (IValueLookupParameter<DoubleValue>)Parameters["Inertia"]; }
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["CurrentInertia"]; }
     }
     public IValueLookupParameter<DoubleValue> PersonalBestAttractionParameter {
@@ -105 +105 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
 
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("Inertia", "Inertia weight on a particle's movement (omega)."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("CurrentInertia", "Inertia weight on a particle's movement (omega)."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("PersonalBestAttraction", "Weight for particle's pull towards its personal best soution (phi_p)."));
       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)."));
@@ -141 +141 @@
       #region Create operator graph
       OperatorGraph.InitialOperator = resultsCollector;
-      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations", null, "CurrentIteration"));
-      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Current Inertia", null, "CurrentInertia"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("CurrentInertia"));
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions"));
       resultsCollector.ResultsParameter.ActualName = "Results";
@@ -170 +170 @@
       subScopesCounter.Name = "Increment EvaluatedSolutions";
       subScopesCounter.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
-      subScopesCounter.Successor = topologyUpdaterPlaceholder; 
+      subScopesCounter.Successor = topologyUpdaterPlaceholder;
 
       topologyUpdaterPlaceholder.Name = "(TopologyUpdater)";

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorParticleUpdater.cs

@@ -63 +63 @@
     }
     public ILookupParameter<DoubleValue> InertiaParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters["Inertia"]; }
+      get { return (ILookupParameter<DoubleValue>)Parameters["CurrentInertia"]; }
     }
     public ILookupParameter<DoubleValue> PersonalBestAttractionParameter {
@@ -125 +125 @@
       Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds", "The lower and upper bounds for each dimension of the position vector for the current problem."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("VelocityBounds", "Upper and lower bounds for the particle's velocity vector."));
-      Parameters.Add(new LookupParameter<DoubleValue>("Inertia", "The weight for the particle's velocity vector."));
+      Parameters.Add(new LookupParameter<DoubleValue>("CurrentInertia", "The weight for the particle's velocity vector."));
       Parameters.Add(new LookupParameter<DoubleValue>("PersonalBestAttraction", "The weight for the particle's personal best position."));
       Parameters.Add(new LookupParameter<DoubleValue>("NeighborBestAttraction", "The weight for the global best position."));