Changeset 3447 for trunk/sources/HeuristicLab.Optimization

Timestamp:

04/20/10 17:37:53 (14 years ago)

Author:

mkommend

Message:

added RowComparer for RunCollectionTabularView (ticket #970)

File:

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

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

@@ -35 +35 @@
     public RunCollection(int capacity) : base(capacity) { Initialize(); }
     public RunCollection(IEnumerable<IRun> collection) : base(collection) { Initialize(); this.OnItemsAdded(collection); }
+    private void Initialize() {
+      parameterNames = new List<string>();
+      resultNames = new List<string>();
+    }
 
     protected static Type[] viewableDataTypes = new Type[]{typeof(BoolValue), typeof(DoubleValue), typeof(IntValue),
@@ -82 +86 @@
     }
 
-    private void Initialize() {
-      parameterNames = new List<string>();
-      resultNames = new List<string>();
-    }
+
 
     private bool AddParameter(string name, IItem value) {
@@ -122 +123 @@
     }
 
+    public IItem GetValue(int rowIndex, int columnIndex) {
+      IRun run = this.list[rowIndex];
+      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];
+      }
+      return value;
+    }
+
     #region IStringConvertibleMatrix Members
     [Storable]
@@ -127 +144 @@
     [Storable]
     private List<string> resultNames;
-    public int Rows {
+    int IStringConvertibleMatrix.Rows {
       get { return this.Count; }
-      set { throw new System.NotImplementedException(); }
-    }
-    public int Columns {
+      set { throw new NotSupportedException(); }
+    }
+    int IStringConvertibleMatrix.Columns {
       get { return parameterNames.Count + resultNames.Count; }
       set { throw new NotSupportedException(); }
     }
-    public IEnumerable<string> ColumnNames {
+    IEnumerable<string> IStringConvertibleMatrix.ColumnNames {
       get {
         List<string> value = new List<string>(parameterNames);
@@ -143 +160 @@
       set { throw new NotSupportedException(); }
     }
-    public IEnumerable<string> RowNames {
+    IEnumerable<string> IStringConvertibleMatrix.RowNames {
       get { return list.Select(x => x.Name).ToList(); }
       set { throw new NotSupportedException(); }
     }
-    public bool SortableView {
+    bool IStringConvertibleMatrix.SortableView {
       get { return true; }
       set { throw new NotSupportedException(); }
     }
-    public bool ReadOnly {
-      get { return false; }
-    }
-
-    public string GetValue(int rowIndex, int columnIndex) {
-      IRun run = this.list[rowIndex];
-      string value = string.Empty;
-
-      if (columnIndex < parameterNames.Count) {
-        string parameterName = parameterNames[columnIndex];
-        if (run.Parameters.ContainsKey(parameterName)) {
-          IItem param = run.Parameters[parameterName];
-          if (param != null) value = param.ToString();
-        }
-      } else if (columnIndex < parameterNames.Count + resultNames.Count) {
-        string resultName = resultNames[columnIndex - parameterNames.Count];
-        if (run.Results.ContainsKey(resultName)) {
-          IItem result = run.Results[resultName];
-          if (result != null) value = result.ToString();
-        }
-      }
-      return value;
+    bool IStringConvertibleMatrix.ReadOnly {
+      get { return true; }
+    }
+
+    string IStringConvertibleMatrix.GetValue(int rowIndex, int columnIndex) {
+      IItem value = GetValue(rowIndex, columnIndex);
+      if (value == null)
+        return string.Empty;
+      return value.ToString();
     }