Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/GP-MoveOperators

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

    r8085 r8206  
    2626using HeuristicLab.Analysis;
    2727using HeuristicLab.Collections;
    28 using HeuristicLab.Common;
    2928using HeuristicLab.Core.Views;
    3029using HeuristicLab.MainForm;
     
    3635    private const string AllDataRows = "All DataRows";
    3736
    38     public RunCollectionDataTableView() {
    39       InitializeComponent();
    40       runMapping = new Dictionary<IRun, IEnumerable<DataRow>>();
    41       combinedDataTable = new DataTable("Combined DataTable", "A data table containing all data rows from all run.");
    42       viewHost.Content = combinedDataTable;
    43       suppressUpdates = false;
    44     }
    45 
    4637    public new RunCollection Content {
    4738      get { return (RunCollection)base.Content; }
     
    4940    }
    5041
     42    private int rowNumber = 0;
    5143    private bool suppressUpdates;
    5244    private readonly Dictionary<IRun, IEnumerable<DataRow>> runMapping;
     
    5446    public DataTable CombinedDataTable {
    5547      get { return combinedDataTable; }
     48    }
     49
     50    public RunCollectionDataTableView() {
     51      InitializeComponent();
     52      runMapping = new Dictionary<IRun, IEnumerable<DataRow>>();
     53      combinedDataTable = new DataTable("Combined DataTable", "A data table containing data rows from multiple runs.");
     54      viewHost.Content = combinedDataTable;
     55      suppressUpdates = false;
    5656    }
    5757
     
    111111    private void run_Changed(object sender, EventArgs e) {
    112112      if (suppressUpdates) return;
    113       IRun run = (IRun)sender;
    114       UpdateRuns(run.ToEnumerable());
    115 
     113      var run = (IRun)sender;
     114      UpdateRuns(new IRun[] { run });
    116115    }
    117116    #endregion
     
    131130    private void RebuildCombinedDataTable() {
    132131      RemoveRuns(Content);
     132      rowNumber = 0;
    133133      AddRuns(Content);
    134134    }
     
    142142      combinedDataTable.Rows.AddRange(dataRows);
    143143    }
     144
    144145    private void RemoveRuns(IEnumerable<IRun> runs) {
    145146      var dataRows = runs.Where(r => runMapping.ContainsKey(r)).SelectMany(r => runMapping[r]).ToList();
     
    165166    }
    166167
    167     private int rowNumber = 0;
    168168    private IEnumerable<DataRow> ExtractDataRowsFromRun(IRun run) {
    169       string resultName = (string)dataTableComboBox.SelectedItem;
    170       string rowName = (string)dataRowComboBox.SelectedItem;
     169      var resultName = (string)dataTableComboBox.SelectedItem;
     170      var rowName = (string)dataRowComboBox.SelectedItem;
    171171      if (!run.Results.ContainsKey(resultName)) yield break;
    172172
    173       DataTable dataTable = (DataTable)run.Results[resultName];
     173      var dataTable = (DataTable)run.Results[resultName];
    174174      foreach (var dataRow in dataTable.Rows) {
    175175        if (dataRow.Name != rowName && rowName != AllDataRows) continue;
     
    197197    private void UpdateDataRowComboBox() {
    198198      dataRowComboBox.Items.Clear();
    199       string resultName = (string)dataTableComboBox.SelectedItem;
     199      var resultName = (string)dataTableComboBox.SelectedItem;
    200200      var dataTables = from run in Content
    201201                       where run.Results.ContainsKey(resultName)
  • branches/GP-MoveOperators/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTabularView.cs

    r7469 r8206  
    164164      RunCollectionRowComparer rowComparer = new RunCollectionRowComparer();
    165165      if (sortedColumns.Count() != 0) {
    166         rowComparer.SortedIndizes = sortedColumns;
     166        rowComparer.SortedIndices = sortedColumns;
    167167        rowComparer.Matrix = Content;
    168168        Array.Sort(newSortedIndex, rowComparer);
     
    194194      }
    195195
    196       private List<KeyValuePair<int, SortOrder>> sortedIndizes;
    197       public IEnumerable<KeyValuePair<int, SortOrder>> SortedIndizes {
    198         get { return this.sortedIndizes; }
    199         set { sortedIndizes = new List<KeyValuePair<int, SortOrder>>(value); }
     196      private List<KeyValuePair<int, SortOrder>> sortedIndices;
     197      public IEnumerable<KeyValuePair<int, SortOrder>> SortedIndices {
     198        get { return this.sortedIndices; }
     199        set { sortedIndices = new List<KeyValuePair<int, SortOrder>>(value); }
    200200      }
    201201      private RunCollection matrix;
     
    212212        if (matrix == null)
    213213          throw new InvalidOperationException("Could not sort IStringConvertibleMatrix if the matrix member is null.");
    214         if (sortedIndizes == null)
     214        if (sortedIndices == null)
    215215          return 0;
    216216
    217         foreach (KeyValuePair<int, SortOrder> pair in sortedIndizes.Where(p => p.Value != SortOrder.None)) {
     217        foreach (KeyValuePair<int, SortOrder> pair in sortedIndices.Where(p => p.Value != SortOrder.None)) {
    218218          value1 = matrix.GetValue(x, pair.Key);
    219219          value2 = matrix.GetValue(y, pair.Key);
Note: See TracChangeset for help on using the changeset viewer.