Changeset 13128 for branches

Timestamp:

11/06/15 14:02:40 (9 years ago)

Author:

pfleck

Message:

#2269 Fixed wrong parameter descriptions.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (3 diffs)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (1 diff)
• MatingPoolCreator.cs (modified) (1 diff)
• ResultsHistoryWiper.cs (modified) (1 diff)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs

@@ -276 +276 @@
       Parameters.Add(new ValueParameter<BoolValue>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
 
-      Parameters.Add(new FixedValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the islands.", new MultiAnalyzer()));
+      Parameters.Add(new FixedValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze all individuals from all layers combined.", new MultiAnalyzer()));
       Parameters.Add(new FixedValueParameter<MultiAnalyzer>("LayerAnalyzer", "The operator used to analyze each layer.", new MultiAnalyzer()));
 
@@ -321 +321 @@
       globalRandomCreator.RandomParameter.ActualName = "GlobalRandom";
       globalRandomCreator.SeedParameter.Value = null;
+      globalRandomCreator.SeedParameter.ActualName = SeedParameter.Name;
       globalRandomCreator.SetSeedRandomlyParameter.Value = null;
+      globalRandomCreator.SetSeedRandomlyParameter.ActualName = SetSeedRandomlyParameter.Name;
       globalRandomCreator.Successor = layer0Creator;
 
@@ -597 +599 @@
       foreach (var selector in SelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
-        // Explicit setting of NumberOfSelectedSubScopesParameter is not required anymore because the NumberOfSelectedSubScopesCalculator calculates it itself
-        //selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSize - Elites.Value)); 
         selector.NumberOfSelectedSubScopesParameter.Hidden = true;
         ParameterizeStochasticOperatorForLayer(selector);

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

@@ -138 +138 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
 
-      Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze the islands."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze all individuals from all layers combined."));
       Parameters.Add(new ValueLookupParameter<IOperator>("LayerAnalyzer", "The operator used to analyze each layer."));
 

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/MatingPoolCreator.cs

@@ -70 +70 @@
           var individuals = prevScope.SubScopes;
           foreach (var individual in individuals) {
-            targetScope.SubScopes.Add((IScope)individual.Clone(new Cloner()));
+            targetScope.SubScopes.Add((IScope)individual.Clone());
           }
         }

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/ResultsHistoryWiper.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Algorithms.ALPS {
-  [Item("ResultsHistoryWiper",
-    "An operator that removes the history of a ResultsCollection by setting all values in all DataTables to NaN.")]
+  [Item("ResultsHistoryWiper", "An operator that removes the history of a ResultsCollection by setting all values in all DataTables to NaN.")]
   [StorableClass]
   public class ResultsHistoryWiper : SingleSuccessorOperator {