Changeset 12071 for branches

Timestamp:

02/25/15 15:05:56 (10 years ago)

Author:

pfleck

Message:

#2269

• Added analyzers in Analyzers and LayerAnalyzers are now configured automatically (depth of scope tree parameters).
• Renamed per layer results to LayerResults.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (7 diffs)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (2 diffs)
• LayerUpdator.cs (modified) (2 diffs)

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

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Analysis;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -60 +61 @@
       get { return (IValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
     }
-    private IValueParameter<MultiAnalyzer> AnalyzerParameter {
-      get { return (IValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
-    }
-    private IValueParameter<MultiAnalyzer> LayerAnalyzerParameter {
-      get { return (IValueParameter<MultiAnalyzer>)Parameters["LayerAnalyzer"]; }
+    private IFixedValueParameter<MultiAnalyzer> AnalyzerParameter {
+      get { return (IFixedValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
+    }
+    private IFixedValueParameter<MultiAnalyzer> LayerAnalyzerParameter {
+      get { return (IFixedValueParameter<MultiAnalyzer>)Parameters["LayerAnalyzer"]; }
     }
     private IValueParameter<IntValue> NumberOfLayersParameter {
@@ -124 +125 @@
     public MultiAnalyzer Analyzer {
       get { return AnalyzerParameter.Value; }
-      set { AnalyzerParameter.Value = value; }
     }
     public MultiAnalyzer LayerAnalyzer {
       get { return LayerAnalyzerParameter.Value; }
-      set { LayerAnalyzerParameter.Value = value; }
     }
     public IntValue NumberOfLayers {
@@ -227 +226 @@
       Parameters.Add(new ValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
       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 ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the islands.", new MultiAnalyzer()));
-      Parameters.Add(new ValueParameter<MultiAnalyzer>("LayerAnalyzer", "The operator used to analyze each layer.", new MultiAnalyzer()));
+      Parameters.Add(new FixedValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the islands.", new MultiAnalyzer()));
+      Parameters.Add(new FixedValueParameter<MultiAnalyzer>("LayerAnalyzer", "The operator used to analyze each layer.", new MultiAnalyzer()));
       Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "The number of layers.", new IntValue(10)));
       Parameters.Add(new ValueParameter<IntArray>("PopulationSize", "The size of the population of solutions each layer.", new IntArray(new[] { 100 })));
@@ -407 +406 @@
       RecalculateAgeLimits();
     }
+    private void AnalyzerOperators_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IAnalyzer>> e) {
+      foreach (var analyzer in e.Items) {
+        foreach (var parameter in analyzer.Value.Parameters.OfType<IScopeTreeLookupParameter>()) {
+          parameter.Depth = 2;
+        }
+      }
+    }
+    private void LayerAnalyzerOperators_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IAnalyzer>> e) {
+      foreach (var analyzer in e.Items) {
+        IParameter resultParameter;
+        if (analyzer.Value.Parameters.TryGetValue("Results", out resultParameter)) {
+          var lookupParameter = resultParameter as ILookupParameter<ResultCollection>;
+          if (lookupParameter != null)
+            lookupParameter.ActualName = "LayerResults";
+        }
+        foreach (var parameter in analyzer.Value.Parameters.OfType<IScopeTreeLookupParameter>()) {
+          parameter.Depth = 1;
+        }
+      }
+    }
     #endregion
 
@@ -423 +442 @@
       NumberOfLayersParameter.ValueChanged += NumberOfLayersParameter_ValueChanged;
       NumberOfLayers.ValueChanged += NumberOfLayers_ValueChanged;
+      Analyzer.Operators.ItemsAdded += AnalyzerOperators_ItemsAdded;
+      LayerAnalyzer.Operators.ItemsAdded += LayerAnalyzerOperators_ItemsAdded;
     }
     private void ParameterizeSolutionsCreator() {
@@ -546 +567 @@
       if (Problem != null) {
         foreach (var analyzer in Problem.Operators.OfType<IAnalyzer>()) {
-          foreach (var parameter in analyzer.Parameters.OfType<IScopeTreeLookupParameter>())
-            parameter.Depth = 2;
           Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
         }

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

@@ -113 +113 @@
 
       layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("LayerEvaluatedSolutions"));
-      layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("Results"));
+      layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("LayerResults"));
       layerVariableCreator.Successor = initLayerAnalyzerPlaceholder;
 
@@ -123 +123 @@
 
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
-      resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("LayerResults", "Result set for each layer", "Results"));
+      resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("LayerResults", "Result set for each layer", "LayerResults"));
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("OpenLayers"));
       resultsCollector.CopyValue = new BoolValue(false);

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

@@ -138 +138 @@
       incrEvaluatedSolutionsForNewLayer.Successor = mainOperator;
 
-      newResultCollectionAssigner.LeftSideParameter.ActualName = "Results";
+      newResultCollectionAssigner.LeftSideParameter.ActualName = "LayerResults";
       newResultCollectionAssigner.RightSideParameter.Value = new ResultCollection();
       newResultCollectionAssigner.Successor = mainOperator;
@@ -147 +147 @@
       incrOpenLayers.Successor = newLayerResultsCollector;
 
-      newLayerResultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("LayerResults", "Result set for each layer", "Results"));
+      newLayerResultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("LayerResults", "Result set for each layer", "LayerResults"));
       newLayerResultsCollector.CopyValue = new BoolValue(false);
       newLayerResultsCollector.Successor = null;