Changeset 5725

Timestamp:

03/17/11 09:12:25 (14 years ago)

Author:

svonolfe

Message:

Implemented review comments from swagner (#1392)

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs (modified) (1 diff)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SuccessfulOffspringAnalysis/SuccessfulOffspringAnalyzer.cs (modified) (6 diffs)
• HeuristicLab.Operators/3.3/StochasticMultiBranch.cs (modified) (3 diffs)

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

@@ -565 +565 @@
       successfulOffspringAnalyzer.ResultsParameter.ActualName = "Results";
       successfulOffspringAnalyzer.GenerationsParameter.ActualName = "Generations";
-      successfulOffspringAnalyzer.SuccessfulOffspringFlag.Value.Value = "SuccessfulOffspring";
+      successfulOffspringAnalyzer.SuccessfulOffspringFlagParameter.Value.Value = "SuccessfulOffspring";
       successfulOffspringAnalyzer.DepthParameter.Value = new IntValue(2);
 

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

@@ -418 +418 @@
       successfulOffspringAnalyzer.ResultsParameter.ActualName = "Results";
       successfulOffspringAnalyzer.GenerationsParameter.ActualName = "Generations";
-      successfulOffspringAnalyzer.SuccessfulOffspringFlag.Value.Value = "SuccessfulOffspring";
+      successfulOffspringAnalyzer.SuccessfulOffspringFlagParameter.Value.Value = "SuccessfulOffspring";
       successfulOffspringAnalyzer.DepthParameter.Value = new IntValue(1);
       if (Problem != null) {

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

@@ -503 +503 @@
       successfulOffspringAnalyzer.ResultsParameter.ActualName = "Results";
       successfulOffspringAnalyzer.GenerationsParameter.ActualName = "Generations";
-      successfulOffspringAnalyzer.SuccessfulOffspringFlag.Value.Value = "SuccessfulOffspring";
+      successfulOffspringAnalyzer.SuccessfulOffspringFlagParameter.Value.Value = "SuccessfulOffspring";
       successfulOffspringAnalyzer.DepthParameter.Value = new IntValue(2);
 

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SuccessfulOffspringAnalysis/SuccessfulOffspringAnalyzer.cs

@@ -40 +40 @@
   [StorableClass]
   public sealed class SuccessfulOffspringAnalyzer : SingleSuccessorOperator, IAnalyzer {
-    public ValueParameter<StringValue> SuccessfulOffspringFlag {
+    public ValueParameter<StringValue> SuccessfulOffspringFlagParameter {
       get { return (ValueParameter<StringValue>)Parameters["SuccessfulOffspringFlag"]; }
     }
 
-    public ValueParameter<ItemCollection<StringValue>> CollectedValues {
+    public ValueParameter<ItemCollection<StringValue>> CollectedValuesParameter {
       get { return (ValueParameter<ItemCollection<StringValue>>)Parameters["CollectedValues"]; }
     }
@@ -50 +50 @@
     public ValueLookupParameter<ResultCollection> ResultsParameter {
       get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
+    }
+
+    public LookupParameter<ResultCollection> SuccessfulOffspringAnalysisParameter {
+      get { return (LookupParameter<ResultCollection>)Parameters["SuccessfulOffspringAnalysis"];  }
     }
 
@@ -71 +75 @@
         Parameters.Add(new ValueParameter<ItemCollection<StringValue>>("CollectedValues", "The properties of the successful offspring that should be collected.", new ItemCollection<StringValue>()));
         Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the succedd progress analysis results should be stored."));
-        Parameters.Add(new LookupParameter<IntValue>("Generations", "The current number of generations."));
+        Parameters.Add(new LookupParameter<IntValue>("Generations", "The current number of generations."));  
+        Parameters.Add(new LookupParameter<ResultCollection>("SuccessfulOffspringAnalysis", "The successful offspring analysis which is created."));
         Parameters.Add(new ValueParameter<IntValue>("Depth", "The depth of the individuals in the scope tree.", new IntValue(1)));
     }
@@ -82 +87 @@
         scopes = scopes.Select(x => (IEnumerable<IScope>)x.SubScopes).Aggregate((a, b) => a.Concat(b)).ToList();
 
-      ItemCollection<StringValue> collectedValues = CollectedValues.Value;
+      ItemCollection<StringValue> collectedValues = CollectedValuesParameter.Value;
         foreach (StringValue collected in collectedValues) {
           //collect the values of the successful offspring
@@ -88 +93 @@
           for (int i = 0; i < scopes.Count; i++) {
             IScope child = scopes[i];
-            string successfulOffspringFlag = SuccessfulOffspringFlag.Value.Value;
+            string successfulOffspringFlag = SuccessfulOffspringFlagParameter.Value.Value;
             if (child.Variables.ContainsKey(collected.Value) && 
                 child.Variables.ContainsKey(successfulOffspringFlag) && 
@@ -103 +108 @@
 
           //create a data table containing the collected values
+          ResultCollection successfulOffspringAnalysis;
+
+          if (SuccessfulOffspringAnalysisParameter.ActualValue == null) {
+            successfulOffspringAnalysis = new ResultCollection();
+            SuccessfulOffspringAnalysisParameter.ActualValue = successfulOffspringAnalysis;
+          } else {
+            successfulOffspringAnalysis = SuccessfulOffspringAnalysisParameter.ActualValue;
+          }
+
+          string resultKey = "SuccessfulOffspringAnalyzer Results";
+          if (!results.ContainsKey(resultKey)) {
+            results.Add(new Result(resultKey, successfulOffspringAnalysis));
+          } else {
+            results[resultKey].Value = successfulOffspringAnalysis;
+          }              
+
           DataTable successProgressAnalysis;
-          string resultKey = "Success Progress " + collected.Value;
-          if (!results.ContainsKey(resultKey)) {
+          if (!successfulOffspringAnalysis.ContainsKey(collected.Value)) {
             successProgressAnalysis = new DataTable();
-            successProgressAnalysis.Name = "Success Progress Analysis";
-            results.Add(new Result(resultKey, successProgressAnalysis));
+            successProgressAnalysis.Name = collected.Value;
+            successfulOffspringAnalysis.Add(new Result(collected.Value, successProgressAnalysis));
           } else {
-            successProgressAnalysis = results[resultKey].Value as DataTable;
-          }
+            successProgressAnalysis = successfulOffspringAnalysis[collected.Value].Value as DataTable;
+          }          
 
           int successfulCount = 0;

trunk/sources/HeuristicLab.Operators/3.3/StochasticMultiBranch.cs

@@ -52 +52 @@
       get { return (ValueParameter<BoolValue>)Parameters["TraceSelectedOperator"]; }
     }
-    public ValueLookupParameter<StringValue> SelectedOperatorParameter {
-      get { return (ValueLookupParameter<StringValue>)Parameters["SelectedOperator"]; }
+    public LookupParameter<StringValue> SelectedOperatorParameter {
+      get { return (LookupParameter<StringValue>)Parameters["SelectedOperator"]; }
     }
 
@@ -65 +65 @@
       #region Backwards Compatibility
       if (!Parameters.ContainsKey("SelectedOperator")) {
-        Parameters.Add(new ValueLookupParameter<StringValue>("SelectedOperator", "If the TraceSelectedOperator flag is set, the name of the operator is traced in this parameter."));
+        Parameters.Add(new LookupParameter<StringValue>("SelectedOperator", "If the TraceSelectedOperator flag is set, the name of the operator is traced in this parameter."));
       }
       if (!Parameters.ContainsKey("TraceSelectedOperator")) {
@@ -86 +86 @@
       Parameters.Add(new ValueLookupParameter<DoubleArray>("Probabilities", "The array of relative probabilities for each operator.", new DoubleArray()));
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
-      Parameters.Add(new ValueLookupParameter<StringValue>("SelectedOperator", "If the TraceSelectedOperator flag is set, the name of the operator is traced in this parameter."));
+      Parameters.Add(new LookupParameter<StringValue>("SelectedOperator", "If the TraceSelectedOperator flag is set, the name of the operator is traced in this parameter."));
       Parameters.Add(new ValueParameter<BoolValue>("TraceSelectedOperator", "Indicates, if the selected operator should be traced.", new BoolValue(false)));
     }