Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Optimization.Views/3.3/RunCollectionViews

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionDataTableView.cs (modified) (9 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTabularView.cs (modified) (3 diffs)

branches/GP-MoveOperators/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionDataTableView.cs

@@ -26 +26 @@
 using HeuristicLab.Analysis;
 using HeuristicLab.Collections;
-using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -36 +35 @@
     private const string AllDataRows = "All DataRows";
 
-    public RunCollectionDataTableView() {
-      InitializeComponent();
-      runMapping = new Dictionary<IRun, IEnumerable<DataRow>>();
-      combinedDataTable = new DataTable("Combined DataTable", "A data table containing all data rows from all run.");
-      viewHost.Content = combinedDataTable;
-      suppressUpdates = false;
-    }
-
     public new RunCollection Content {
       get { return (RunCollection)base.Content; }
@@ -49 +40 @@
     }
 
+    private int rowNumber = 0;
     private bool suppressUpdates;
     private readonly Dictionary<IRun, IEnumerable<DataRow>> runMapping;
@@ -54 +46 @@
     public DataTable CombinedDataTable {
       get { return combinedDataTable; }
+    }
+
+    public RunCollectionDataTableView() {
+      InitializeComponent();
+      runMapping = new Dictionary<IRun, IEnumerable<DataRow>>();
+      combinedDataTable = new DataTable("Combined DataTable", "A data table containing data rows from multiple runs.");
+      viewHost.Content = combinedDataTable;
+      suppressUpdates = false;
     }
 
@@ -111 +111 @@
     private void run_Changed(object sender, EventArgs e) {
       if (suppressUpdates) return;
-      IRun run = (IRun)sender;
-      UpdateRuns(run.ToEnumerable());
-
+      var run = (IRun)sender;
+      UpdateRuns(new IRun[] { run });
     }
     #endregion
@@ -131 +130 @@
     private void RebuildCombinedDataTable() {
       RemoveRuns(Content);
+      rowNumber = 0;
       AddRuns(Content);
     }
@@ -142 +142 @@
       combinedDataTable.Rows.AddRange(dataRows);
     }
+
     private void RemoveRuns(IEnumerable<IRun> runs) {
       var dataRows = runs.Where(r => runMapping.ContainsKey(r)).SelectMany(r => runMapping[r]).ToList();
@@ -165 +166 @@
     }
 
-    private int rowNumber = 0;
     private IEnumerable<DataRow> ExtractDataRowsFromRun(IRun run) {
-      string resultName = (string)dataTableComboBox.SelectedItem;
-      string rowName = (string)dataRowComboBox.SelectedItem;
+      var resultName = (string)dataTableComboBox.SelectedItem;
+      var rowName = (string)dataRowComboBox.SelectedItem;
       if (!run.Results.ContainsKey(resultName)) yield break;
 
-      DataTable dataTable = (DataTable)run.Results[resultName];
+      var dataTable = (DataTable)run.Results[resultName];
       foreach (var dataRow in dataTable.Rows) {
         if (dataRow.Name != rowName && rowName != AllDataRows) continue;
@@ -197 +197 @@
     private void UpdateDataRowComboBox() {
       dataRowComboBox.Items.Clear();
-      string resultName = (string)dataTableComboBox.SelectedItem;
+      var resultName = (string)dataTableComboBox.SelectedItem;
       var dataTables = from run in Content
                        where run.Results.ContainsKey(resultName)

branches/GP-MoveOperators/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTabularView.cs

@@ -164 +164 @@
       RunCollectionRowComparer rowComparer = new RunCollectionRowComparer();
       if (sortedColumns.Count() != 0) {
-        rowComparer.SortedIndizes = sortedColumns;
+        rowComparer.SortedIndices = sortedColumns;
         rowComparer.Matrix = Content;
         Array.Sort(newSortedIndex, rowComparer);
@@ -194 +194 @@
       }
 
-      private List<KeyValuePair<int, SortOrder>> sortedIndizes;
-      public IEnumerable<KeyValuePair<int, SortOrder>> SortedIndizes {
-        get { return this.sortedIndizes; }
-        set { sortedIndizes = new List<KeyValuePair<int, SortOrder>>(value); }
+      private List<KeyValuePair<int, SortOrder>> sortedIndices;
+      public IEnumerable<KeyValuePair<int, SortOrder>> SortedIndices {
+        get { return this.sortedIndices; }
+        set { sortedIndices = new List<KeyValuePair<int, SortOrder>>(value); }
       }
       private RunCollection matrix;
@@ -212 +212 @@
         if (matrix == null)
           throw new InvalidOperationException("Could not sort IStringConvertibleMatrix if the matrix member is null.");
-        if (sortedIndizes == null)
+        if (sortedIndices == null)
           return 0;
 
-        foreach (KeyValuePair<int, SortOrder> pair in sortedIndizes.Where(p => p.Value != SortOrder.None)) {
+        foreach (KeyValuePair<int, SortOrder> pair in sortedIndices.Where(p => p.Value != SortOrder.None)) {
           value1 = matrix.GetValue(x, pair.Key);
           value2 = matrix.GetValue(y, pair.Key);