Changeset 3446 for trunk/sources

Timestamp:

04/20/10 17:01:31 (14 years ago)

Author:

abeham

Message:

updated OSIslandGA #976

Location:

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3

Files:

• OffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (7 diffs)
• OffspringSelectionIslandGeneticAlgorithmMainLoop.cs (modified) (2 diffs)

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

@@ -37 +37 @@
   public sealed class OffspringSelectionGeneticAlgorithmMainLoop : AlgorithmOperator {
     #region Parameter properties
-    public OptionalValueParameter<VariableCreator> VariableInitializerParameter {
-      get { return (OptionalValueParameter<VariableCreator>)Parameters["VariableInitializer"]; }
-    }
     public ValueLookupParameter<IRandom> RandomParameter {
       get { return (ValueLookupParameter<IRandom>)Parameters["Random"]; }
@@ -104 +101 @@
     }
     #endregion
-
-    public VariableCreator VariableInitializer {
-      get { return VariableInitializerParameter.Value; }
-      set { VariableInitializerParameter.Value = value; }
-    }
 
     [StorableConstructor]
@@ -119 +111 @@
     private void Initialize() {
       #region Create parameters
-      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."));
@@ -144 +135 @@
 
       #region Create operators
-      Placeholder variableInitializer = new Placeholder();
+      ConditionalBranch initializationBranch = new ConditionalBranch();
       VariableCreator variableCreator = new VariableCreator();
       Assigner variableAssigner = new Assigner();
@@ -196 +187 @@
       ConditionalBranch conditionalBranch2 = new ConditionalBranch();
 
-      VariableInitializer.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0)));
-      VariableInitializer.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutions", new IntValue(0)));
-      VariableInitializer.Successor = variableAssigner;
-
-      variableAssigner.LeftSideParameter.ActualName = "ComparisonFactor";
-      variableAssigner.RightSideParameter.ActualName = ComparisonFactorLowerBoundParameter.Name;
-
-      variableInitializer.Name = "VariableInitializer (placeholder)";
-      variableInitializer.OperatorParameter.ActualName = VariableInitializerParameter.Name;
-
+      initializationBranch.ConditionParameter.ActualName = "IsInitialized";
+
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutions", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("SelectionPressure", new DoubleValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("CurrentSuccessRatio", new DoubleValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutionsResult", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("IsInitialized", new BoolValue(true)));
+
+      variableAssigner.LeftSideParameter.ActualName = "ComparisonFactor";
+      variableAssigner.RightSideParameter.ActualName = ComparisonFactorLowerBoundParameter.Name;
 
       bestQualityMemorizer1.BestQualityParameter.ActualName = "BestQuality";
@@ -397 +386 @@
 
       #region Create operator graph
-      OperatorGraph.InitialOperator = variableInitializer;
-      variableInitializer.Successor = variableCreator;
-      variableCreator.Successor = bestQualityMemorizer1;
+      OperatorGraph.InitialOperator = initializationBranch;
+      initializationBranch.FalseBranch = variableCreator;
+      initializationBranch.Successor = selector;
+      variableCreator.Successor = variableAssigner;
+      variableAssigner.Successor = bestQualityMemorizer1;
       bestQualityMemorizer1.Successor = bestQualityMemorizer2;
       bestQualityMemorizer2.Successor = bestAverageWorstQualityCalculator1;
@@ -407 +398 @@
       qualityDifferenceCalculator1.Successor = visualizer1;
       visualizer1.Successor = resultsCollector;
-      resultsCollector.Successor = selector;
+      resultsCollector.Successor = null;
       selector.Successor = subScopesProcessor1;
       subScopesProcessor1.Operators.Add(new EmptyOperator());

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

@@ -192 +192 @@
       
       islandVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("IslandResults", new ResultCollection()));
-      islandVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0)));
-      islandVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutions", new IntValue(0)));
-
-      islandVariableAssigner.LeftSideParameter.ActualName = "ComparisonFactor";
-      islandVariableAssigner.RightSideParameter.ActualName = ComparisonFactorLowerBoundParameter.Name;
+
+      islandVariableAssigner.LeftSideParameter.ActualName = "MaximumGenerations";
+      islandVariableAssigner.RightSideParameter.ActualName = "MigrationInterval";
 
       bestQualityMemorizer1.BestQualityParameter.ActualName = "BestQuality";
@@ -242 +240 @@
       resultsCollector.ResultsParameter.ActualName = ResultsParameter.Name;
 
-      mainLoop.VariableInitializer = null; // we do the variable initialization here
       mainLoop.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
       mainLoop.MaximizationParameter.ActualName = MaximizationParameter.Name;