Changeset 13723

Timestamp:

03/24/16 11:01:41 (9 years ago)

Author:

pkuelzer

Message:

#2558
maxLayer default = 10000 instead of 100000 to avoid overflow
layer creator now wipes evaluated Layersolutions
evaluated Solution data reducer assigns the value instead of summing it
changed default age gap to 20
start on generation 1 to avoid immediate reseeding
fixes also done in islandosAlps

Location:

branches/IslandALPS/IslandALPS/3.3

Files:

• IslandALPSAlgorithm.cs (modified) (2 diffs)
• IslandAlpsAlgorithmMainLoop.cs (modified) (4 diffs)
• Offspring Selection/IslandAlpsOffspringSelectionAlgorithm.cs (modified) (2 diffs)
• Offspring Selection/IslandAlpsOffspringSelectionAlgorithmMainLoop.cs (modified) (4 diffs)

branches/IslandALPS/IslandALPS/3.3/IslandALPSAlgorithm.cs

@@ -381 +381 @@
       #region ALPSParameter
 
-      Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers.", new IntValue(5)));
+      Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers.", new IntValue(20)));
       Parameters.Add(new ValueParameter<DoubleValue>("AgeInheritance", "A weight that determines the age of a child after crossover based on the older (1.0) and younger (0.0) parent.", new DoubleValue(1)));
       Parameters.Add(new ValueParameter<IntArray>("AgeLimits", "The maximum age an individual is allowed to reach in a certain layer.", new IntArray(new int[0])) {Hidden = true});
@@ -387 +387 @@
       Parameters.Add(new ValueParameter<BoolValue>("ReduceToPopulationSize", ".", new BoolValue(true)));
 
-      Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "", new IntValue(100000)));
+      Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "", new IntValue(10000)));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("LayerAnalyzer", "The operator used to analyze each layer.", new MultiAnalyzer()));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("GroupAnalyzer", "The operator used to analyze each layergroup.", new MultiAnalyzer()));

branches/IslandALPS/IslandALPS/3.3/IslandAlpsAlgorithmMainLoop.cs

@@ -268 +268 @@
       #endregion
 
-      globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(GenerationsParametername, new IntValue(0)));
+      globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(GenerationsParametername, new IntValue(1)));
       globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(MigrationsParametername, new IntValue(0)));
 
@@ -296 +296 @@
       incrementEvaluatedSolutionDr.TargetParameter.ActualName = EvaluatedSolutions.Name;
       incrementEvaluatedSolutionDr.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum);
-      incrementEvaluatedSolutionDr.TargetOperation.Value = new ReductionOperation(ReductionOperations.Sum);
+      incrementEvaluatedSolutionDr.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign);
 
       setIslandEvaluatedSolutions.ParameterToReduce.ActualName = LayerEvaluatedSolutionsParameter.Name;
@@ -535 +535 @@
       var updateLayerNumber = new Assigner {Name = "Layer = OpenLayers"};
       var historyWiper = new ResultsHistoryWiper {Name = "Clear History in Results"};
+      var evaluatedSolutionsWiper = new Assigner() {Name = "Clear evaluated Solutions"};
       var createChildrenViaCrossover = new AlpsGeneticAlgorithmMainOperator();
       var incrEvaluatedSolutionsForNewLayer = new SubScopesCounter {Name = "Update EvaluatedSolutions"};
@@ -569 +570 @@
 
       historyWiper.ResultsParameter.ActualName = LayerResultsParametername;
-      historyWiper.Successor = createChildrenViaCrossover;
+      historyWiper.Successor = evaluatedSolutionsWiper;
+      evaluatedSolutionsWiper.LeftSideParameter.ActualName = LayerEvaluatedSolutionsParameterName;
+      evaluatedSolutionsWiper.RightSideParameter.Value = new IntValue(0);
+      evaluatedSolutionsWiper.Successor = createChildrenViaCrossover;
 
       // Maybe use only crossover and no elitism instead of "default operator"

branches/IslandALPS/IslandALPS/3.3/Offspring Selection/IslandAlpsOffspringSelectionAlgorithm.cs

@@ -389 +389 @@
       #region ALPSParameter
 
-      Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers.", new IntValue(5)));
+      Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers.", new IntValue(20)));
       Parameters.Add(new ValueParameter<DoubleValue>("AgeInheritance", "A weight that determines the age of a child after crossover based on the older (1.0) and younger (0.0) parent.", new DoubleValue(1)));
       Parameters.Add(new ValueParameter<IntArray>("AgeLimits", "The maximum age an individual is allowed to reach in a certain layer.", new IntArray(new int[0])) {Hidden = true});
@@ -395 +395 @@
       Parameters.Add(new ValueParameter<BoolValue>("ReduceToPopulationSize", ".", new BoolValue(true)));
 
-      Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "", new IntValue(100000)));
+      Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "", new IntValue(10000)));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("LayerAnalyzer", "The operator used to analyze each layer.", new MultiAnalyzer()));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("GroupAnalyzer", "The operator used to analyze each layergroup.", new MultiAnalyzer()));

branches/IslandALPS/IslandALPS/3.3/Offspring Selection/IslandAlpsOffspringSelectionAlgorithmMainLoop.cs

@@ -294 +294 @@
       #endregion
 
-      globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(GenerationsParametername, new IntValue(0)));
+      globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(GenerationsParametername, new IntValue(1)));
       globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(MigrationsParametername, new IntValue(0)));
 
@@ -322 +322 @@
       incrementEvaluatedSolutionDr.TargetParameter.ActualName = EvaluatedSolutions.Name;
       incrementEvaluatedSolutionDr.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum);
-      incrementEvaluatedSolutionDr.TargetOperation.Value = new ReductionOperation(ReductionOperations.Sum);
+      incrementEvaluatedSolutionDr.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign);
 
       setIslandEvaluatedSolutions.ParameterToReduce.ActualName = LayerEvaluatedSolutionsParameter.Name;
@@ -577 +577 @@
       var updateLayerNumber = new Assigner {Name = "Layer = OpenLayers"};
       var historyWiper = new ResultsHistoryWiper {Name = "Clear History in Results"};
+      var evaluatedSolutionsWiper = new Assigner() { Name = "Clear evaluated Solutions" };
       var createChildrenViaCrossover = new AlpsOffspringSelectionGeneticAlgorithmMainOperator();
       var incrEvaluatedSolutionsForNewLayer = new SubScopesCounter {Name = "Update EvaluatedSolutions"};
@@ -612 +613 @@
 
       historyWiper.ResultsParameter.ActualName = "LayerResults";
-      historyWiper.Successor = createChildrenViaCrossover;
+      historyWiper.Successor = evaluatedSolutionsWiper;
+      evaluatedSolutionsWiper.LeftSideParameter.ActualName = LayerEvaluatedSolutionsParameterName;
+      evaluatedSolutionsWiper.RightSideParameter.Value = new IntValue(0);
+      evaluatedSolutionsWiper.Successor = createChildrenViaCrossover;
 
       // Maybe use only crossover and no elitism instead of "default operator"