Changeset 3358 for trunk/sources

Timestamp:

04/15/10 18:12:23 (15 years ago)

Author:

mkofler

Message:

Worked on particle swarm optimization algorithm #852 (WIP)

Location:

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3

Files:

• ParticleSwarmOptimization.cs (modified) (1 diff)
• ParticleSwarmOptimizationMainLoop.cs (modified) (4 diffs)
• RealVectorToPermutationDecoder.cs (added)

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

@@ -143 +143 @@
       foreach (IRealVectorEncoder encoder in Problem.Operators.OfType<IRealVectorEncoder>().OrderBy(x => x.Name)) {
         EncoderParameter.ValidValues.Add(encoder);
-        //encoder.RealVectorParameter.ActualName
+        encoder.RealVectorParameter.ActualName = "Position"; 
       }
       if (oldEncoder != null) {

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

@@ -23 +23 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["Encoder"]; }
     }
+    public ValueLookupParameter<IOperator> EvaluatorParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["Evaluator"]; }
+    }
     #endregion
 
@@ -36 +39 @@
       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<IOperator>("Evaluator", "The operator used to evaluate solutions."));
       #endregion
 
@@ -43 +47 @@
       UniformSubScopesProcessor uniformSubScopesProcessor = new UniformSubScopesProcessor();
       Placeholder encoder = new Placeholder();
+      Placeholder evaluator = new Placeholder();
 
       encoder.Name = "Encoder (placeholder)";
       encoder.OperatorParameter.ActualName = EncoderParameter.Name;
+
+      evaluator.Name = "Evaluator (placeholder)";
+      evaluator.OperatorParameter.ActualName = EvaluatorParameter.Name;
       #endregion
 
@@ -52 +60 @@
       variableCreator.Successor = uniformSubScopesProcessor;
       uniformSubScopesProcessor.Operator = encoder;
-      uniformSubScopesProcessor.Successor = null;
+      uniformSubScopesProcessor.Successor = evaluator;
       #endregion
     }