Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/26/12 09:51:13 (12 years ago)
Author:
jkarder
Message:

#1331: merged r8086:8330 from trunk

Location:
branches/ScatterSearch (trunk integration)
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/ScatterSearch (trunk integration)

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/AlgorithmView.Designer.cs

    r8086 r8331  
    5959      //
    6060      this.startButton.Location = new System.Drawing.Point(0, 458);
    61       this.toolTip.SetToolTip(this.startButton, "Start/Resume Experiment");
     61      this.toolTip.SetToolTip(this.startButton, "Start/Resume Algorithm");
    6262      //
    6363      // executionTimeTextBox
    … …  
    7272      //
    7373      this.pauseButton.Location = new System.Drawing.Point(30, 458);
    74       this.toolTip.SetToolTip(this.pauseButton, "Pause Experiment");
     74      this.toolTip.SetToolTip(this.pauseButton, "Pause Algorithm");
    7575      //
    7676      // stopButton
    7777      //
    7878      this.stopButton.Location = new System.Drawing.Point(60, 458);
    79       this.toolTip.SetToolTip(this.stopButton, "Stop Experiment");
     79      this.toolTip.SetToolTip(this.stopButton, "Stop Algorithm");
    8080      //
    8181      // resetButton
    8282      //
    8383      this.resetButton.Location = new System.Drawing.Point(90, 458);
    84       this.toolTip.SetToolTip(this.resetButton, "Reset Experiment");
     84      this.toolTip.SetToolTip(this.resetButton, "Reset Algorithm");
    8585      //
    8686      // nameTextBox

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs

    r8086 r8331  
    5555      //
    5656      this.startButton.Location = new System.Drawing.Point(0, 459);
    57       this.toolTip.SetToolTip(this.startButton, "Start/Resume Experiment");
     57      this.toolTip.SetToolTip(this.startButton, "Start/Resume Batchrun");
    5858      //
    5959      // executionTimeTextBox
    … …  
    6868      //
    6969      this.pauseButton.Location = new System.Drawing.Point(30, 459);
    70       this.toolTip.SetToolTip(this.pauseButton, "Pause Experiment");
     70      this.toolTip.SetToolTip(this.pauseButton, "Pause Batchrun");
    7171      //
    7272      // stopButton
    7373      //
    7474      this.stopButton.Location = new System.Drawing.Point(60, 459);
    75       this.toolTip.SetToolTip(this.stopButton, "Stop Experiment");
     75      this.toolTip.SetToolTip(this.stopButton, "Stop Batchrun");
    7676      //
    7777      // resetButton
    7878      //
    7979      this.resetButton.Location = new System.Drawing.Point(90, 458);
    80       this.toolTip.SetToolTip(this.resetButton, "Reset Experiment");
     80      this.toolTip.SetToolTip(this.resetButton, "Reset Batchrun");
    8181      //
    8282      // nameTextBox

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/IOptimizerView.Designer.cs

    r8086 r8331  
    7373      this.startButton.Size = new System.Drawing.Size(24, 24);
    7474      this.startButton.TabIndex = 10;
    75       this.toolTip.SetToolTip(this.startButton, "Start/Resume Experiment");
     75      this.toolTip.SetToolTip(this.startButton, "Start/Resume Optimizer");
    7676      this.startButton.UseVisualStyleBackColor = true;
    7777      this.startButton.Click += new System.EventHandler(this.startButton_Click);
    … …  
    104104      this.pauseButton.Size = new System.Drawing.Size(24, 24);
    105105      this.pauseButton.TabIndex = 11;
    106       this.toolTip.SetToolTip(this.pauseButton, "Pause Experiment");
     106      this.toolTip.SetToolTip(this.pauseButton, "Pause Optimizer");
    107107      this.pauseButton.UseVisualStyleBackColor = true;
    108108      this.pauseButton.Click += new System.EventHandler(this.pauseButton_Click);
    … …  
    116116      this.stopButton.Size = new System.Drawing.Size(24, 24);
    117117      this.stopButton.TabIndex = 12;
    118       this.toolTip.SetToolTip(this.stopButton, "Stop Experiment");
     118      this.toolTip.SetToolTip(this.stopButton, "Stop Optimizer");
    119119      this.stopButton.UseVisualStyleBackColor = true;
    120120      this.stopButton.Click += new System.EventHandler(this.stopButton_Click);
    … …  
    128128      this.resetButton.Size = new System.Drawing.Size(24, 24);
    129129      this.resetButton.TabIndex = 13;
    130       this.toolTip.SetToolTip(this.resetButton, "Reset Experiment");
     130      this.toolTip.SetToolTip(this.resetButton, "Reset Optimizer");
    131131      this.resetButton.UseVisualStyleBackColor = true;
    132132      this.resetButton.Click += new System.EventHandler(this.resetButton_Click);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/Plugin.cs.frame

    r8086 r8331  
    2626  /// Plugin class for HeuristicLab.Optimization.Views plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Optimization.Views", "3.3.6.$WCREV$")]
     28  [Plugin("HeuristicLab.Optimization.Views", "3.3.7.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Optimization.Views-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Analysis", "3.3")]

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/Properties/AssemblyInfo.cs.frame

    r7259 r8331  
    5454// by using the '*' as shown below:
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
     56[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionDataTableView.cs

    r8086 r8331  
    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/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTabularView.cs

    r7469 r8331  
    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.