Changeset 3479 for trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3

Timestamp:

04/21/10 22:05:40 (14 years ago)

Author:

abeham

Message:

added first draft of SASEGASA #839

Location:

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj (modified) (1 diff)
• IslandOffspringSelectionGeneticAlgorithm.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionIslandGeneticAlgorithm.cs) (5 diffs)
• IslandOffspringSelectionGeneticAlgorithmMainLoop.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionIslandGeneticAlgorithmMainLoop.cs) (2 diffs)
• OffspringSelectionGeneticAlgorithm.cs (modified) (2 diffs)
• OffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (6 diffs)
• SASEGASA.cs (added)
• SASEGASAMainLoop.cs (added)

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

@@ -80 +80 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="SASEGASA.cs" />
+    <Compile Include="SASEGASAMainLoop.cs" />
     <Compile Include="HeuristicLabAlgorithmsOffspringSelectionGeneticAlgorithmPlugin.cs" />
-    <Compile Include="OffspringSelectionIslandGeneticAlgorithm.cs" />
-    <Compile Include="OffspringSelectionIslandGeneticAlgorithmMainLoop.cs" />
+    <Compile Include="IslandOffspringSelectionGeneticAlgorithm.cs" />
+    <Compile Include="IslandOffspringSelectionGeneticAlgorithmMainLoop.cs" />
     <Compile Include="OffspringSelectionGeneticAlgorithm.cs" />
     <Compile Include="OffspringSelectionGeneticAlgorithmMainLoop.cs" />

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

@@ -39 +39 @@
   /// An offspring selection island genetic algorithm.
   /// </summary>
-  [Item("Offspring Selection Island Genetic Algorithm", "An offspring selection island genetic algorithm.")]
+  [Item("Island Offspring Selection Genetic Algorithm", "An island offspring selection genetic algorithm.")]
   [Creatable("Algorithms")]
   [StorableClass]
-  public sealed class OffspringSelectionIslandGeneticAlgorithm : EngineAlgorithm {
+  public sealed class IslandOffspringSelectionGeneticAlgorithm : EngineAlgorithm {
 
     #region Problem Properties
@@ -229 +229 @@
       get { return (SolutionsCreator)IslandProcessor.Operator; }
     }
-    private OffspringSelectionIslandGeneticAlgorithmMainLoop MainLoop {
-      get { return (OffspringSelectionIslandGeneticAlgorithmMainLoop)IslandProcessor.Successor; }
+    private IslandOffspringSelectionGeneticAlgorithmMainLoop MainLoop {
+      get { return (IslandOffspringSelectionGeneticAlgorithmMainLoop)IslandProcessor.Successor; }
     }
     #endregion
 
     [StorableConstructor]
-    private OffspringSelectionIslandGeneticAlgorithm(bool deserializing) : base(deserializing) { }
-    public OffspringSelectionIslandGeneticAlgorithm()
+    private IslandOffspringSelectionGeneticAlgorithm(bool deserializing) : base(deserializing) { }
+    public IslandOffspringSelectionGeneticAlgorithm()
       : base() {
       Parameters.Add(new ValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
@@ -246 +246 @@
       Parameters.Add(new ConstrainedValueParameter<ISelector>("EmigrantsSelector", "Selects the individuals that will be migrated."));
       Parameters.Add(new ConstrainedValueParameter<ISelector>("ImmigrationSelector", "Selects the population from the unification of the original population and the immigrants."));
-      Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions.", new IntValue(100)));
+      Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions of each island.", new IntValue(100)));
       Parameters.Add(new ValueParameter<IntValue>("MaximumMigrations", "The maximum number of migrations that should occur.", new IntValue(100)));
       Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction."));
@@ -265 +265 @@
       UniformSubScopesProcessor ussp1 = new UniformSubScopesProcessor();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
-      OffspringSelectionIslandGeneticAlgorithmMainLoop mainLoop = new OffspringSelectionIslandGeneticAlgorithmMainLoop();
+      IslandOffspringSelectionGeneticAlgorithmMainLoop mainLoop = new IslandOffspringSelectionGeneticAlgorithmMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
 
@@ -313 +313 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      OffspringSelectionIslandGeneticAlgorithm clone = (OffspringSelectionIslandGeneticAlgorithm)base.Clone(cloner);
+      IslandOffspringSelectionGeneticAlgorithm clone = (IslandOffspringSelectionGeneticAlgorithm)base.Clone(cloner);
       clone.Initialize();
       return clone;

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

@@ -37 +37 @@
 namespace HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm {
   /// <summary>
-  /// An offspring selection island genetic algorithm main loop operator.
+  /// An island offspring selection genetic algorithm main loop operator.
   /// </summary>
-  [Item("OffspringSelectionIslandGeneticAlgorithmMainLoop", "An offspring selection island genetic algorithm main loop operator.")]
+  [Item("IslandOffspringSelectionGeneticAlgorithmMainLoop", "An island offspring selection genetic algorithm main loop operator.")]
   [StorableClass]
-  public sealed class OffspringSelectionIslandGeneticAlgorithmMainLoop : AlgorithmOperator {
+  public sealed class IslandOffspringSelectionGeneticAlgorithmMainLoop : AlgorithmOperator {
     #region Parameter Properties
     public ValueLookupParameter<IRandom> RandomParameter {
@@ -127 +127 @@
 
     [StorableConstructor]
-    private OffspringSelectionIslandGeneticAlgorithmMainLoop(bool deserializing) : base() { }
-    public OffspringSelectionIslandGeneticAlgorithmMainLoop()
+    private IslandOffspringSelectionGeneticAlgorithmMainLoop(bool deserializing) : base() { }
+    public IslandOffspringSelectionGeneticAlgorithmMainLoop()
       : base() {
       #region Create parameters

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

@@ -212 +212 @@
       solutionsCreator.Successor = mainLoop;
 
-      mainLoop.PopulationSizeParameter.ActualName = PopulationSizeParameter.Name;
       mainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
       mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
@@ -285 +284 @@
     private void PopulationSizeParameter_ValueChanged(object sender, EventArgs e) {
       PopulationSize.ValueChanged += new EventHandler(PopulationSize_ValueChanged);
-      MainLoop.PopulationSizeParameter.Value = new IntValue(PopulationSize.Value - Elites.Value);
       ParameterizeSelectors();
     }
     private void PopulationSize_ValueChanged(object sender, EventArgs e) {
-      MainLoop.PopulationSizeParameter.Value = new IntValue(PopulationSize.Value - Elites.Value);
       ParameterizeSelectors();
     }

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

@@ -43 +43 @@
       get { return (ValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
     }
-    public ValueLookupParameter<IntValue> PopulationSizeParameter {
-      get { return (ValueLookupParameter<IntValue>)Parameters["PopulationSize"]; }
-    }
     public SubScopesLookupParameter<DoubleValue> QualityParameter {
       get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
@@ -113 +110 @@
       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."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("PopulationSize", "The size of the population."));
       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("BestKnownQuality", "The best known quality value found so far."));
@@ -189 +185 @@
       initializationBranch.ConditionParameter.ActualName = "IsInitialized";
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // this variable is referenced in SASEGASAMainLoop, do not change!
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutions", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("SelectionPressure", new DoubleValue(0)));
@@ -196 +192 @@
       variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("IsInitialized", new BoolValue(true)));
 
-      variableAssigner.LeftSideParameter.ActualName = "ComparisonFactor";
+      variableAssigner.LeftSideParameter.ActualName = "ComparisonFactor"; // this variable is referenced in SASEGASA, OffspringSelectionGeneticAlgorithm, do not change!
       variableAssigner.RightSideParameter.ActualName = ComparisonFactorLowerBoundParameter.Name;
 
@@ -313 +309 @@
       offspringSelector.LuckyLosersParameter.ActualName = "OSLuckyLosers";
       offspringSelector.MaximumSelectionPressureParameter.ActualName = MaximumSelectionPressureParameter.Name;
-      offspringSelector.PopulationSizeParameter.ActualName = PopulationSizeParameter.Name;
       offspringSelector.SelectionPressureParameter.ActualName = "SelectionPressure";
       offspringSelector.SuccessRatioParameter.ActualName = SuccessRatioParameter.Name;
@@ -382 +377 @@
 
       conditionalBranch2.Name = "MaximumGenerations reached?";
-      conditionalBranch2.ConditionParameter.ActualName = "TerminateMaximumGenerations";
+      conditionalBranch2.ConditionParameter.ActualName = "TerminateMaximumGenerations"; // this variable is referenced in SASEGASAMainLoop, do not change!
       #endregion