Changeset 3717 for trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

Timestamp:

05/08/10 04:36:13 (14 years ago)

Author:

mkommend

Message:

sorting of column names in RunCollection and fixed errors in RunCollectionConstraints (ticket #970)

File:

• trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -147 +147 @@
 
     public IItem GetValue(IRun run, int columnIndex) {
+      string name = ((IStringConvertibleMatrix)this).ColumnNames.ElementAt(columnIndex);
+      return GetValue(run, name);
+    }
+
+    public IItem GetValue(IRun run, string columnName) {
       IItem value = null;
-      if (columnIndex < parameterNames.Count) {
-        string parameterName = parameterNames[columnIndex];
-        if (run.Parameters.ContainsKey(parameterName))
-          value = run.Parameters[parameterName];
-      } else if (columnIndex < parameterNames.Count + resultNames.Count) {
-        string resultName = resultNames[columnIndex - parameterNames.Count];
-        if (run.Results.ContainsKey(resultName))
-          value = run.Results[resultName];
-      }
+       if (run.Parameters.ContainsKey(columnName))
+         value = run.Parameters[columnName];
+       else if (run.Results.ContainsKey(columnName))
+         value = run.Results[columnName];
       return value;
     }
+
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -193 +194 @@
         List<string> value = new List<string>(parameterNames);
         value.AddRange(resultNames);
+        value.Sort();
         return value;
       }