Changeset 3719 for trunk/sources

Timestamp:

05/08/10 16:33:50 (15 years ago)

Author:

mkofler

Message:

Worked on #852 (PSO)

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified) (7 diffs)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimizationMainLoop.cs (modified) (10 diffs)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleUpdater.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/PermutationToRealVectorEncoder.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IRealVectorDecoder.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IRealVectorEncoder.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/Interfaces/IRealVectorPSODecoder.cs (added)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (3 diffs)

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

@@ -81 +81 @@
 
     #region Properties
-    [StorableAttribute]
+    [Storable]
     private ParticleSwarmOptimizationMainLoop mainLoop; // Check this !
     private ParticleSwarmOptimizationMainLoop MainLoop {
       get { return mainLoop; }
     }
-    [StorableAttribute]
+    [Storable]
     private Assigner bestLocalQualityInitalizer; // Check this !
     private Assigner BestLocalQualityInitalizer {
       get { return bestLocalQualityInitalizer; }
     }
-
+    [Storable]
     private BestAverageWorstQualityAnalyzer qualityAnalyzer;
     #endregion
@@ -102 +102 @@
       Parameters.Add(new ValueParameter<IntValue>("MaxIterations", "Maximal number of iterations.", new IntValue(1000)));
       Parameters.Add(new ConstrainedValueParameter<IRealVectorEncoder>("Encoder", "The operator used to encode solutions as position vector."));
-      Parameters.Add(new ValueParameter<IntValue>("PositionLength", "Length of the position encoding.", new IntValue(0)));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
       RandomCreator randomCreator = new RandomCreator();
@@ -181 +180 @@
       comparator.Successor = branch;
       uniformSubScopesProcessor2.Successor = mainLoop;
+      InitializeAnalyzers();
+      UpdateAnalyzers();
       Initialize();
     }
@@ -186 +187 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      InitializeAnalyzers();
-      UpdateAnalyzers();
       EncoderParameter.ValueChanged += new EventHandler(EncoderParameter_ValueChanged);
       if (Problem != null) {
@@ -211 +210 @@
       UpdateEncoders();
       UpdateAnalyzers();
+      ParameterizeAnalyzers(); 
       bestLocalQualityInitalizer.RightSideParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -218 +218 @@
 
     private void EncoderParameter_ValueChanged(object sender, EventArgs e) {
-      //IRealVectorEncoder old = (IRealVectorEncoder)((UniformSubScopesProcessor)((VariableCreator)((SolutionsCreator)((RandomCreator)OperatorGraph.InitialOperator).Successor).Successor).Successor).Operator;
+      //MainLoop.EncoderParameter.ActualValue = (IRealVectorEncoder) EncoderParameter.ActualValue;
       //((UniformSubScopesProcessor)((VariableCreator)((SolutionsCreator)((RandomCreator)OperatorGraph.InitialOperator).Successor).Successor).Successor).Operator = EncoderParameter.Value;
       //((SingleSuccessorOperator)EncoderParameter.Value).Successor = ((SingleSuccessorOperator)old).Successor;
@@ -228 +228 @@
       // 
       //
-    }
-
-    private void ParameterizeMainLoop() {
-      //GeneticAlgorithmMainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     }
 

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

@@ -12 +12 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
@@ -24 +25 @@
       get { return (ValueLookupParameter<VariableCollection>)Parameters["Results"]; }
     }
-    public ValueLookupParameter<IOperator> EncoderParameter {
-      get { return (ValueLookupParameter<IOperator>)Parameters["Encoder"]; }
+    public ValueLookupParameter<IRealVectorEncoder> EncoderParameter {
+      get { return (ValueLookupParameter<IRealVectorEncoder>)Parameters["Encoder"]; }
     }
     public ValueLookupParameter<IOperator> DecoderParameter {
@@ -47 +48 @@
     #endregion
 
+    [Storable]
+    private ParticleUpdater velocityUpdater; 
+
     [StorableConstructor]
     private ParticleSwarmOptimizationMainLoop(bool deserializing) : base() { }
@@ -57 +61 @@
       #region Create parameters
       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("Encoder", "The encoding operator that maps a solution to a position vector."));
+      Parameters.Add(new ValueLookupParameter<IRealVectorEncoder>("Encoder", "The encoding operator that maps a solution to a position vector."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Decoder", "The decoding operator that maps a position vector to a solution."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
@@ -66 +70 @@
       #endregion
 
+      EncoderParameter.ActualNameChanged += new EventHandler(EncoderParameter_ActualNameChanged);
+
       #region Create operators
       VariableCreator variableCreator = new VariableCreator();
@@ -71 +77 @@
       IntCounter intCounter = new IntCounter();
       ConditionalBranch conditionalBranch = new ConditionalBranch();
-      ParticleUpdater velocityUpdater = new ParticleUpdater(); 
+      velocityUpdater = new ParticleUpdater(); 
       UniformSubScopesProcessor uniformSubScopesProcessor = new UniformSubScopesProcessor();
       UniformSubScopesProcessor uniformSubScopesProcessor2 = new UniformSubScopesProcessor();
@@ -84 +90 @@
       analyzer1.OperatorParameter.ActualName = AnalyzerParameter.Name;
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(1))); // Initial generation already built
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Initial generation already built
 
       resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
@@ -103 +109 @@
       velocityUpdater.CurrentPositionParameter.ActualName = "Position";
       velocityUpdater.VelocityParameter.ActualName = "Velocity";
+      //
+      // ToDo: Add correctly 
 
       encPlaceholder.OperatorParameter.ActualName = EncoderParameter.ActualName;
@@ -116 +124 @@
       swarmUpdater.LocalBestQualityParameter.ActualName = "BestQuality";
       swarmUpdater.GlobalBestQualityParameter.ActualName = "CurrentBestBestQuality";
-
       #endregion
 
@@ -125 +132 @@
       conditionalBranch.FalseBranch = uniformSubScopesProcessor;
       uniformSubScopesProcessor.Operator = velocityUpdater;
+      uniformSubScopesProcessor.Successor = intCounter;
       velocityUpdater.Successor = decPlaceholder;
-      uniformSubScopesProcessor.Successor = uniformSubScopesProcessor2;
-      uniformSubScopesProcessor2.Operator = evaluator;
+      decPlaceholder.Successor = evaluator;
       evaluator.Successor = swarmUpdater;
-      swarmUpdater.Successor = intCounter;
+      swarmUpdater.Successor = null;
       intCounter.Successor = resultsCollector1;
-      resultsCollector1.Successor = comparator; //analyzer1; 
-      //analyzer1.Successor = comparator;
+      resultsCollector1.Successor = analyzer1; 
+      analyzer1.Successor = comparator;
       #endregion
+    }
+
+    private void EncoderParameter_ActualNameChanged(object sender, EventArgs e) {
+      velocityUpdater.BoundsParameter.ActualName = EncoderParameter.ActualValue.BoundsParameter.ActualName;
     }
   }

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

@@ -32 +32 @@
       get { return (ILookupParameter<RealVector>)Parameters["BestGlobal"]; }
     }
+
+    public ILookupParameter<DoubleMatrix> BoundsParameter {
+      get { return (ILookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
+    }
     #endregion
 
@@ -41 +45 @@
       Parameters.Add(new LookupParameter<RealVector>("BestLocal", "Best local position"));
       Parameters.Add(new LookupParameter<RealVector>("BestGlobal", "Best global position"));
+      Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds", "The lower and upper bounds for each dimension of the position vector."));
     }
 
@@ -53 +58 @@
       for (int i = 0; i < CurrentPositionParameter.ActualValue.Length; i++) {
         CurrentPositionParameter.ActualValue[i] = CurrentPositionParameter.ActualValue[i] + VelocityParameter.ActualValue[i];
+        if (CurrentPositionParameter.ActualValue[i] < BoundsParameter.ActualValue[0,0]) {
+          CurrentPositionParameter.ActualValue[i] = BoundsParameter.ActualValue[0, 0]; 
+        } else if (CurrentPositionParameter.ActualValue[i] > BoundsParameter.ActualValue[0,1]) {
+          CurrentPositionParameter.ActualValue[i] = BoundsParameter.ActualValue[0, 1]; 
+        }
       }
       return base.Apply();

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

@@ -28 +28 @@
     }
 
+    public IValueLookupParameter<DoubleMatrix> BoundsParameter {
+      get { return (IValueLookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
+    }
+
+    public DoubleMatrix Bounds {
+      get { return (DoubleMatrix)BoundsParameter.ActualValue; }
+      set { BoundsParameter.ActualValue = value; }
+    }
+
     public PermutationToRealVectorEncoder() : base() {
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The permutation to encode."));
       Parameters.Add(new LookupParameter<RealVector>("RealVector", "The resulting real vector."));
       Parameters.Add(new LookupParameter<IntValue>("Length", "Vector length."));
+      Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds", "The lower and upper bounds in each dimension."));
     }
 

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IRealVectorDecoder.cs

@@ -10 +10 @@
     IParameter RealVectorParameter { get; }
     ILookupParameter<IntValue> LengthParameter { get; }
+    IValueParameter<DoubleMatrix> BoundsParameter { get; }
   }
 }

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IRealVectorEncoder.cs

@@ -27 +27 @@
 namespace HeuristicLab.Optimization {
   public interface IRealVectorEncoder : IOperator {
-    //Type DecoderType { get; }
     IParameter RealVectorParameter { get; }
     ILookupParameter<IntValue> LengthParameter { get; }
+    IValueLookupParameter<DoubleMatrix> BoundsParameter { get; }
   }
 }

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

@@ -101 +101 @@
     <Compile Include="Evaluators\ZakharovEvaluator.cs" />
     <Compile Include="HeuristicLabProblemsTestFunctionsPlugin.cs" />
+    <Compile Include="Interfaces\IRealVectorPSODecoder.cs" />
     <Compile Include="Interfaces\IBestSingleObjectiveTestFunctionSolutionAnalyzer.cs" />
     <Compile Include="Interfaces\IRastriginMoveEvaluator.cs" />
@@ -123 +124 @@
     <Compile Include="MoveEvaluators\AdditiveMoveEvaluator.cs" />
     <Compile Include="MoveEvaluators\RealVectorAdditiveMoveWrapper.cs" />
+    <Compile Include="RealVectorToRealVectorDecoder.cs" />
+    <Compile Include="RealVectorToRealVectorEncoder.cs" />
     <Compile Include="SingleObjectiveTestFunctionSolution.cs" />
     <Compile Include="SingleObjectiveTestFunctionProblem.cs" />

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -221 +221 @@
       if (Bounds.Columns != 2 || Bounds.Rows < 1)
         Bounds = new DoubleMatrix(1, 2);
+      ParameterizeOperators(); 
     }
     private void Bounds_ItemChanged(object sender, EventArgs<int, int> e) {
@@ -227 +228 @@
       if (e.Value2 == 1 && Bounds[e.Value, 0] >= Bounds[e.Value, 1])
         Bounds[e.Value, 0] = Bounds[e.Value, 1] - 0.1;
+      ParameterizeOperators(); 
     }
     private void MoveGenerator_AdditiveMoveParameter_ActualNameChanged(object sender, EventArgs e) {
@@ -355 +357 @@
       }
       foreach (IRealVectorPSOEncoder op in Operators.OfType<IRealVectorPSOEncoder>()) {
-        ((ILookupParameter)op.OriginalRealVectorParameter).ActualName = SolutionCreator.RealVectorParameter.ActualName; 
+        ((ILookupParameter)op.OriginalRealVectorParameter).ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        op.BoundsParameter.Value = (DoubleMatrix)BoundsParameter.Value.Clone();
+        op.BoundsParameter.ActualName = "ParticleBounds"; 
       }
     }