Changeset 3415 for trunk

Timestamp:

04/19/10 20:49:12 (15 years ago)

Author:

mkofler

Message:

Worked on particle swarm optimization algorithm #852 (WIP)

Location:

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3

Files:

• HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj (modified) (1 diff)
• ParticleSwarmOptimization.cs (modified) (5 diffs)
• ParticleSwarmOptimizationMainLoop.cs (modified) (4 diffs)
• RealVectorToRealVectorEncoder.cs (added)

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj

@@ -86 +86 @@
     <Compile Include="PermutationToRealVectorEncoder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RealVectorToRealVectorEncoder.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -48 +48 @@
       set { base.Problem = value; }
     }
+    public IRealVectorEncoder Encoder {
+      get { return EncoderParameter.Value; }
+      set { EncoderParameter.Value = value; }
+    }
     #endregion 
 
@@ -84 +88 @@
       Parameters.Add(new OptionalConstrainedValueParameter<IRealVectorEncoder>("Encoder", "The operator used to encode solutions as position vector."));
       //Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
-
       RandomCreator randomCreator = new RandomCreator();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
+      UniformSubScopesProcessor uniformSubScopesProcessor = new UniformSubScopesProcessor();
+      VariableCreator variableCreator = new VariableCreator();
+      variableCreator.CollectedValues.Add(new ValueParameter<RealVector>("Velocity", new RealVector()));
       //solutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreator.Name;
-      mainLoop = new ParticleSwarmOptimizationMainLoop();
+      //mainLoop = new ParticleSwarmOptimizationMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
 
@@ -99 +105 @@
 
       solutionsCreator.NumberOfSolutionsParameter.ActualName = SwarmSizeParameter.Name;
-      solutionsCreator.Successor = mainLoop;
+      solutionsCreator.Successor = variableCreator;
+      variableCreator.Successor = uniformSubScopesProcessor;
+      
 
-      mainLoop.EncoderParameter.ActualName = EncoderParameter.Name;
+      //evaluator.Successor = mainLoop;
+      //mainLoop.EncoderParameter.ActualName = EncoderParameter.Name;
 
       Initialize();
     }
 
+    [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      
+      EncoderParameter.ValueChanged += new EventHandler(EncoderParameter_ValueChanged);
     }
 
@@ -136 +146 @@
       base.OnProblemChanged();
     }
+
+    private void EncoderParameter_ValueChanged(object sender, EventArgs e) {
+      ((UniformSubScopesProcessor)((SolutionsCreator)((RandomCreator)OperatorGraph.InitialOperator).Successor).Successor).Operator = EncoderParameter.Value;
+    }
     #endregion
 
@@ -152 +166 @@
       }
     }
+
     #endregion
   }

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

@@ -24 +24 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["Encoder"]; }
     }
-    public ValueLookupParameter<IOperator> EvaluatorParameter {
-      get { return (ValueLookupParameter<IOperator>)Parameters["Evaluator"]; }
-    }
+    //public ValueLookupParameter<IOperator> EvaluatorParameter {
+    //  get { return (ValueLookupParameter<IOperator>)Parameters["Evaluator"]; }
+    //}
     #endregion
 
@@ -40 +40 @@
       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."));
+      //Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions."));
       #endregion
 
@@ -53 +53 @@
       encoder.OperatorParameter.ActualName = EncoderParameter.Name;
 
-      evaluator.Name = "Evaluator (placeholder)";
-      evaluator.OperatorParameter.ActualName = EvaluatorParameter.Name;
+      //evaluator.Name = "Evaluator (placeholder)";
+      //evaluator.OperatorParameter.ActualName = EvaluatorParameter.Name;
       #endregion
 
@@ -61 +61 @@
       variableCreator.Successor = uniformSubScopesProcessor;
       uniformSubScopesProcessor.Operator = encoder;
-      uniformSubScopesProcessor.Successor = evaluator;
+      //uniformSubScopesProcessor.Successor = evaluator;
       #endregion
     }