Changeset 13857 for branches/IslandALPS

Timestamp:

05/25/16 12:08:56 (9 years ago)

Author:

pkuelzer

Message:

#2558 Added SucessRatio and SelectionPressure Analyzer

Location:

branches/IslandALPS/IslandALPS/3.3/Offspring Selection

Files:

• IslandAlpsOffspringSelectionAlgorithm.cs (modified) (6 diffs)
• IslandAlpsOffspringSelectionAlgorithmMainLoop.cs (modified) (1 diff)

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

@@ -218 +218 @@
     [Storable] private readonly BestAverageWorstQualityAnalyzer layerQualityAnalyzer;
     [Storable] private readonly BestAverageWorstQualityAnalyzer groupQualityAnalyzer;
+    [Storable] private readonly ValueAnalyzer layerSelectionPressureAnalyzer;
+    [Storable] private readonly ValueAnalyzer currentSucessRatioAnalyzer;
 
     #endregion
@@ -240 +242 @@
       layerQualityAnalyzer = cloner.Clone(original.layerQualityAnalyzer);
       groupQualityAnalyzer = cloner.Clone(original.groupQualityAnalyzer);
+      layerSelectionPressureAnalyzer = cloner.Clone(original.layerSelectionPressureAnalyzer);
+      currentSucessRatioAnalyzer = cloner.Clone(currentSucessRatioAnalyzer);
       //terminator
       generationsTerminator = cloner.Clone(original.generationsTerminator);
@@ -295 +299 @@
       layerQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
       groupQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      layerSelectionPressureAnalyzer = new ValueAnalyzer();
+      currentSucessRatioAnalyzer = new ValueAnalyzer();
       #endregion
 
@@ -696 +702 @@
       GroupAnalyzer.Operators.Add(groupQualityAnalyzer, false);
       LayerAnalyzer.Operators.Add(layerQualityAnalyzer, false);
+      LayerAnalyzer.Operators.Add(layerSelectionPressureAnalyzer, false);
+      LayerAnalyzer.Operators.Add(currentSucessRatioAnalyzer, false);
       IslandAnalyzer.Operators.Add(islandQualityAnalyzer, false);
+
       Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
+
       //depth for each analyzer gets set when added
       if (Problem != null) {
@@ -707 +717 @@
         }
       }
+      //setting the right depth because adding analyzer sets the depth
+      layerSelectionPressureAnalyzer.ValueParameter.Depth = 0;
+      currentSucessRatioAnalyzer.ValueParameter.Depth = 0;
+
     }
 
@@ -859 +873 @@
       groupQualityAnalyzer.ResultsParameter.Hidden = true;
 
+      layerSelectionPressureAnalyzer.Name = "SelectionPressureAnalyzer Layer";
+      layerSelectionPressureAnalyzer.ResultsParameter.ActualName = "LayerResults";
+      layerSelectionPressureAnalyzer.ValueParameter.ActualName = "SelectionPressure";
+      layerSelectionPressureAnalyzer.ValuesParameter.ActualName = "SelectionPressure History";
+
+      currentSucessRatioAnalyzer.Name = "CurrentSuccessRatio Analyzer";
+      currentSucessRatioAnalyzer.ResultsParameter.ActualName = "Results";
+      currentSucessRatioAnalyzer.ValueParameter.ActualName = "CurrentSuccessRatio";
+      currentSucessRatioAnalyzer.ValuesParameter.ActualName = "Success Ratio History";
+
       if (Problem != null) {
         SetAnalyzerParameter(layerQualityAnalyzer);

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

@@ -302 +302 @@
       layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(LayerParametername, new IntValue(0)));
       layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>(LayerResultsParametername));
+      layerVariableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("SelectionPressure", new DoubleValue(0)));
+      layerVariableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("CurrentSuccessRatio", new DoubleValue(0)));
 
       groupVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>(GroupResultsParametername));