Changeset 3690

Timestamp:

05/07/10 02:21:01 (14 years ago)

Author:

swagner

Message:

Fixed bug in DataTableValuesCollector and ResultsCollector (#999)

Location:

trunk/sources

Files:

• HeuristicLab.Analysis/3.3/DataTableValuesCollector.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Operators/3.3/ResultsCollector.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Analysis/3.3/DataTableValuesCollector.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -59 +60 @@
           AddValue(table, (param.ActualValue as DoubleValue).Value, name, param.Description);
         } else if (param.ActualValue is IEnumerable<DoubleValue>) {
-          int counter = 0;
-          foreach (DoubleValue data in (param.ActualValue as IEnumerable<DoubleValue>)) {
-            AddValue(table, data.Value, name + " " + counter.ToString(), param.Description);
-            counter++;
+          IEnumerable<DoubleValue> values = (IEnumerable<DoubleValue>)param.ActualValue;
+          if (values.Count() <= 1) {
+            foreach (DoubleValue data in values)
+              AddValue(table, data != null ? data.Value : double.NaN, name, param.Description);
+          } else {
+            int counter = 1;
+            foreach (DoubleValue data in values) {
+              AddValue(table, data != null ? data.Value : double.NaN, name + " " + counter.ToString(), param.Description);
+              counter++;
+            }
           }
         } else {

trunk/sources/HeuristicLab.Optimization.Operators/3.3/ResultsCollector.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -62 +63 @@
           string name = lookupParam != null ? lookupParam.TranslatedName : param.Name;
 
+          IScopeTreeLookupParameter scopeTreeLookupParam = param as IScopeTreeLookupParameter;
+          if ((scopeTreeLookupParam != null) && (scopeTreeLookupParam.Depth == 0)) {
+            IEnumerator enumerator = ((IEnumerable)value).GetEnumerator();
+            if (enumerator.MoveNext())
+              value = (IItem)enumerator.Current;
+          }
+
           results.TryGetValue(name, out result);
           if (result != null)