Changeset 3429

Timestamp:

04/20/10 01:48:30 (14 years ago)

Author:

abeham

Message:

Added an OS Island GA #976
Wired the parallel parameter in the standard Island GA #971

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionIslandGeneticAlgorithm.cs (added)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionIslandGeneticAlgorithmMainLoop.cs (added)

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

@@ -180 +180 @@
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
     }
+    private UniformSubScopesProcessor IslandProcessor {
+      get { return ((RandomCreator.Successor as SubScopesCreator).Successor as UniformSubScopesProcessor); }
+    }
     private SolutionsCreator SolutionsCreator {
-      get { return (SolutionsCreator)((RandomCreator.Successor as SubScopesCreator).Successor as UniformSubScopesProcessor).Operator; }
+      get { return (SolutionsCreator)IslandProcessor.Operator; }
     }
     private IslandGeneticAlgorithmMainLoop MainLoop {
-      get { return (IslandGeneticAlgorithmMainLoop)((RandomCreator.Successor as SubScopesCreator).Successor as UniformSubScopesProcessor).Successor; }
+      get { return (IslandGeneticAlgorithmMainLoop)IslandProcessor.Successor; }
     }
     #endregion
@@ -226 +229 @@
       populationCreator.Successor = ussp1;
 
+      ussp1.Parallel = null;
+      ussp1.ParallelParameter.ActualName = ParallelParameter.Name;
       ussp1.Operator = solutionsCreator;
       ussp1.Successor = mainLoop;

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

@@ -81 +81 @@
   <ItemGroup>
     <Compile Include="HeuristicLabAlgorithmsOffspringSelectionGeneticAlgorithmPlugin.cs" />
+    <Compile Include="OffspringSelectionIslandGeneticAlgorithm.cs" />
+    <Compile Include="OffspringSelectionIslandGeneticAlgorithmMainLoop.cs" />
     <Compile Include="OffspringSelectionGeneticAlgorithm.cs" />
     <Compile Include="OffspringSelectionGeneticAlgorithmMainLoop.cs" />

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs

@@ -37 +37 @@
   public sealed class OffspringSelectionGeneticAlgorithmMainLoop : AlgorithmOperator {
     #region Parameter properties
-    public ValueParameter<VariableCreator> VariableInitializerParameter {
-      get { return (ValueParameter<VariableCreator>)Parameters["VariableInitializer"]; }
+    public OptionalValueParameter<VariableCreator> VariableInitializerParameter {
+      get { return (OptionalValueParameter<VariableCreator>)Parameters["VariableInitializer"]; }
     }
     public ValueLookupParameter<IRandom> RandomParameter {
@@ -119 +119 @@
     private void Initialize() {
       #region Create parameters
-      Parameters.Add(new ValueParameter<VariableCreator>("VariableInitializer", "Operator to initialize some variables.", new VariableCreator()));
+      Parameters.Add(new OptionalValueParameter<VariableCreator>("VariableInitializer", "Operator to initialize some variables.", new VariableCreator()));
       Parameters.Add(new ValueLookupParameter<IRandom>("Random", "A pseudo random number generator."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));