Changeset 3479

Timestamp:

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

Author:

abeham

Message:

added first draft of SASEGASA #839

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionIslandGeneticAlgorithm.cs) (5 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionIslandGeneticAlgorithmMainLoop.cs) (2 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (6 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs (added)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASAMainLoop.cs (added)
• HeuristicLab.Analysis/3.3/DataTableValuesCollector.cs (modified) (1 diff)
• HeuristicLab.Optimization.Operators/3.3/SASEGASAReunificator.cs (modified) (3 diffs)
• HeuristicLab.Parameters/3.3/SubScopesLookupParameter.cs (modified) (1 diff)
• HeuristicLab.Selection/3.3/OffspringSelector.cs (modified) (4 diffs)

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
 

trunk/sources/HeuristicLab.Analysis/3.3/DataTableValuesCollector.cs

@@ -52 +52 @@
 
       foreach (IParameter param in CollectedValues) {
-        DoubleValue data = param.ActualValue as DoubleValue;
-        if (data == null) data = new DoubleValue(double.NaN);
-
-        DataRow row;
-        table.Rows.TryGetValue(param.Name, out row);
-        if (row == null) {
-          row = new DataRow(param.Name, param.Description);
-          row.Values.Add(data.Value);
-          table.Rows.Add(row);
+        if (param.ActualValue is DoubleValue) {
+          DoubleValue data = param.ActualValue as DoubleValue;
+          DataRow row;
+          table.Rows.TryGetValue(param.Name, out row);
+          if (row == null) {
+            row = new DataRow(param.Name, param.Description);
+            row.Values.Add(data.Value);
+            table.Rows.Add(row);
+          } else {
+            row.Values.Add(data.Value);
+          }
+        } else if (param.ActualValue is ItemArray<DoubleValue>) {
+          ItemArray<DoubleValue> dataArray = param.ActualValue as ItemArray<DoubleValue>;
+          DataRow row;
+          for (int i = 0; i < dataArray.Length; i++) {
+            table.Rows.TryGetValue(param.Name + i.ToString(), out row);
+            if (row == null) {
+              row = new DataRow(param.Name + i.ToString(), param.Description);
+              row.Values.Add(dataArray[i].Value);
+              table.Rows.Add(row);
+            } else {
+              row.Values.Add(dataArray[i].Value);
+            }
+          }
         } else {
-          row.Values.Add(data.Value);
+          DataRow row;
+          table.Rows.TryGetValue(param.Name, out row);
+          if (row == null) {
+            row = new DataRow(param.Name, param.Description);
+            row.Values.Add(double.NaN);
+            table.Rows.Add(row);
+          } else {
+            row.Values.Add(double.NaN);
+          }
         }
       }

trunk/sources/HeuristicLab.Optimization.Operators/3.3/SASEGASAReunificator.cs

@@ -26 +26 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Optimization.Operators {
@@ -32 +34 @@
   /// scopes by 1 and uniformly partitions the sub sub scopes again, maintaining the order.
   /// </summary>
-  /*[Item("SASEGASAReunificator", "This operator merges the villages in a migration phase and redistributes the individuals. It is implemented as described in Affenzeller, M. et al. 2009. Genetic Algorithms and Genetic Programming - Modern Concepts and Practical Applications, CRC Press.")]
+  [Item("SASEGASAReunificator", "This operator merges the villages in a migration phase and redistributes the individuals. It is implemented as described in Affenzeller, M. et al. 2009. Genetic Algorithms and Genetic Programming - Modern Concepts and Practical Applications, CRC Press.")]
   [StorableClass]
   public class SASEGASAReunificator : SingleSuccessorOperator, IMigrator {
 
+    public LookupParameter<IntValue> VillageCountParameter {
+      get { return (LookupParameter<IntValue>)Parameters["VillageCount"]; }
+    }
+
+    public SASEGASAReunificator()
+      : base() {
+      Parameters.Add(new LookupParameter<IntValue>("VillageCount", "The number of villages left after the reunification."));
+    }
     /// <summary>
     /// Joins all sub sub scopes of the given <paramref name="scope"/>, reduces the number of sub 
     /// scopes by 1 and uniformly partitions the sub sub scopes again, maintaining the order.
     /// </summary>
-    /// <exception cref="InvalidOperationException">Thrown when only 0 or 1 sub scope is available.</exception>
+    /// <exception cref="InvalidOperationException">Thrown when there are less than 2 sub-scopes available or when VillageCount does not equal the number of sub-scopes.</exception>
     /// <param name="scope">The current scope whose sub scopes to reduce.</param>
     /// <returns><c>null</c>.</returns>
     public override IOperation Apply() {
       IScope scope = ExecutionContext.Scope;
-      int villageCount = scope.SubScopes.Count;
+      if (VillageCountParameter.ActualValue == null) VillageCountParameter.ActualValue = new IntValue(scope.SubScopes.Count);
+      int villageCount = VillageCountParameter.ActualValue.Value;
       if (villageCount <= 1)
-        throw new InvalidOperationException("SASEGASA reunification requires 2 or more sub-scopes");
+        throw new InvalidOperationException(Name + ": Reunification requires 2 or more sub-scopes");
+      if (villageCount != scope.SubScopes.Count)
+        throw new InvalidOperationException(Name + ": VillageCount does not equal the number of sub-scopes");
 
       // get all villages
-      IList<IScope> population = new List<IScope>();
+      List<IScope> population = new List<IScope>();
       for (int i = 0; i < villageCount; i++) {
-        while (scope.SubScopes[i].SubScopes[0].SubScopes.Count > 0) {
-          population.Add(scope.SubScopes[i].SubScopes[0].SubScopes[0]);
-          scope.SubScopes[i].SubScopes.Remove(scope.SubScopes[i].SubScopes[0].SubScopes[0]);
-        }
+        population.AddRange(scope.SubScopes[i].SubScopes);
         scope.SubScopes[i].SubScopes.Clear();
       }
@@ -64 +74 @@
       int populationPerVillage = population.Count / villageCount;
       for (int i = 0; i < villageCount; i++) {
-        scope.SubScopes[i].SubScopes.Add(new Scope());
-        scope.SubScopes[i].SubScopes.Add(new Scope());
-        for (int j = 0; j < populationPerVillage; j++) {
-          scope.SubScopes[i].SubScopes[1].SubScopes.Add(population[0]);
-          population.RemoveAt(0);
-        }
+        scope.SubScopes[i].SubScopes.AddRange(population.GetRange(0, populationPerVillage));
+        population.RemoveRange(0, populationPerVillage);
       }
 
       // add remaining sub-sub-scopes to last sub-scope
-      while (population.Count > 0) {
-        scope.SubScopes[scope.SubScopes.Count - 1].SubScopes[1].SubScopes.Add(population[0]);
-        population.RemoveAt(0);
-      }
+      scope.SubScopes[scope.SubScopes.Count - 1].SubScopes.AddRange(population);
+      population.Clear();
+
+      VillageCountParameter.ActualValue.Value = villageCount;
 
       return base.Apply();
     }
-  }*/
+  }
 }

trunk/sources/HeuristicLab.Parameters/3.3/SubScopesLookupParameter.cs

@@ -35 +35 @@
     public SubScopesLookupParameter(string name) : base(name) { }
     public SubScopesLookupParameter(string name, string description) : base(name, description) { }
+    public SubScopesLookupParameter(string name, string description, string actualName) : base(name, description, actualName) { }
 
     protected override IItem GetActualValue() {

trunk/sources/HeuristicLab.Selection/3.3/OffspringSelector.cs

@@ -34 +34 @@
   public class OffspringSelector : SingleSuccessorOperator {
 
-    public ValueLookupParameter<IntValue> PopulationSizeParameter {
-      get { return (ValueLookupParameter<IntValue>)Parameters["PopulationSize"]; }
-    }
     public ValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
       get { return (ValueLookupParameter<DoubleValue>)Parameters["MaximumSelectionPressure"]; }
@@ -66 +63 @@
     public OffspringSelector()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IntValue>("PopulationSize", "The number of offspring to create."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("MaximumSelectionPressure", "The maximum selection pressure which prematurely terminates the offspring selection step."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("SuccessRatio", "The ratio of successful offspring that has to be produced."));
@@ -77 +73 @@
 
     public override IOperation Apply() {
-      int populationSize = PopulationSizeParameter.ActualValue.Value;
       double maxSelPress = MaximumSelectionPressureParameter.ActualValue.Value;
       double successRatio = SuccessRatioParameter.ActualValue.Value;
@@ -83 +78 @@
       IScope parents = scope.SubScopes[0];
       IScope children = scope.SubScopes[1];
+      int populationSize = parents.SubScopes.Count;
 
       // retrieve actual selection pressure and success ratio