Changeset 5492

Timestamp:

02/16/11 14:50:59 (13 years ago)

Author:

svonolfe

Message:

Implemented various changes as proposed by vdorfer and swinkler (#1392)

• Collecting the successful values now works when elites are enabled
• The initial iteration (0) is not collected
• The DataTable now has a Name

Location:

branches/SuccessProgressAnalysis

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SuccessProgressAnalysis/SuccessProgressAnalyzer.cs (modified) (6 diffs)
• HeuristicLab.Operators/3.3/StochasticMultiBranch.cs (modified) (2 diffs)

branches/SuccessProgressAnalysis/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SuccessProgressAnalysis/SuccessProgressAnalyzer.cs

@@ -40 +40 @@
   [StorableClass]
   public sealed class SuccessProgressAnalyzer: SingleSuccessorOperator, IAnalyzer {
-    public ScopeTreeLookupParameter<BoolValue> SuccessfulOffspring {
-      get { return (ScopeTreeLookupParameter<BoolValue>)Parameters["SuccessfulOffspring"]; }
+    public ValueParameter<StringValue> SuccessfulOffspringFlag {
+      get { return (ValueParameter<StringValue>)Parameters["SuccessfulOffspringFlag"]; }
     }
 
@@ -64 +64 @@
     public SuccessProgressAnalyzer()
       : base() {
-        Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("SuccessfulOffspring", "Indicates if the individual was successful."));
+        Parameters.Add(new ValueParameter<StringValue>("SuccessfulOffspringFlag", "Indicates if the individual was successful.", new StringValue("SuccessfulOffspring")));
         Parameters.Add(new ValueParameter<ItemCollection<StringValue>>("CollectedValues", "The values 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."));
@@ -73 +73 @@
       ResultCollection results = ResultsParameter.ActualValue;
       
-      ItemArray<BoolValue> successfulOffspring = SuccessfulOffspring.ActualValue;
       ItemCollection<StringValue> collectedValues = CollectedValues.Value;
-
-      int successfulCount = successfulOffspring.Where(s => s.Value).Count();
-      if (successfulCount > 0 && collectedValues.Count > 0 && successfulOffspring.Length == ExecutionContext.Scope.SubScopes.Count) {
         foreach (StringValue collected in collectedValues) {
           Dictionary<String, int> counts = new Dictionary<String, int>();
           for (int i = 0; i < ExecutionContext.Scope.SubScopes.Count; i++) {
             IScope child = ExecutionContext.Scope.SubScopes[i];
+            string successfulOffspringFlag = SuccessfulOffspringFlag.Value.Value;
+            if (child.Variables.ContainsKey(collected.Value) && 
+                child.Variables.ContainsKey(successfulOffspringFlag) && 
+                (child.Variables[successfulOffspringFlag].Value is BoolValue) &&
+                (child.Variables[successfulOffspringFlag].Value as BoolValue).Value) {
+              String key = child.Variables[collected.Value].Value.ToString();
 
-            if (successfulOffspring[i].Value && child.Variables.ContainsKey(collected.Value)) {
-              String key = child.Variables[collected.Value].Value.ToString();
-  
               if (!counts.ContainsKey(key))
-               counts.Add(key, 1);
+                counts.Add(key, 1);
               else
-               counts[key]++;
+                counts[key]++;
             }
           }
@@ -97 +96 @@
           if (!results.ContainsKey(resultKey)) {
             successProgressAnalysis = new DataTable();
+            successProgressAnalysis.Name = "Success Progress Analysis";
             results.Add(new Result(resultKey, successProgressAnalysis));
           } else {
             successProgressAnalysis = results[resultKey].Value as DataTable;
+          }
+
+          int successfulCount = 0;
+          foreach (string key in counts.Keys) {
+            successfulCount += counts[key];
           }
 
@@ -108 +113 @@
               int iterations = Generations.ActualValue.Value;
 
-              for (int i = 0; i < iterations; i++)
+              for (int i = 1; i < iterations; i++)
                 row.Values.Add(0);
 
@@ -124 +129 @@
           }
         }  
-      }
 
       return base.Apply();

branches/SuccessProgressAnalysis/HeuristicLab.Operators/3.3/StochasticMultiBranch.cs

@@ -153 +153 @@
       OperationCollection next = new OperationCollection(base.Apply());
       if (successor != null) {
-        ExecutedOperatorParameter.ActualValue = new StringValue(successor.GetType().Name);
+        if(ReportExecutedOperatorParameter.Value.Value)
+          ExecutedOperatorParameter.ActualValue = new StringValue(successor.Name);
 
         if (CreateChildOperation)
@@ -159 +160 @@
         else next.Insert(0, ExecutionContext.CreateOperation(successor));
       } else {
-        ExecutedOperatorParameter.ActualValue = new StringValue("");
+        if (ReportExecutedOperatorParameter.Value.Value)
+          ExecutedOperatorParameter.ActualValue = new StringValue("");
       }
       return next;