Changeset 13911


Ignore:
Timestamp:
06/17/16 14:23:56 (3 years ago)
Author:
ascheibe
Message:

#2587 merged r13681 into stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Optimizer

  • stable/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.Designer.cs

    r13454 r13911  
    147147      // repetitionsNumericUpDown
    148148      //
    149       this.repetitionsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    150                   | System.Windows.Forms.AnchorStyles.Right)));
     149      this.repetitionsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     150            | System.Windows.Forms.AnchorStyles.Right)));
    151151      this.repetitionsNumericUpDown.Location = new System.Drawing.Point(113, 28);
    152152      this.repetitionsNumericUpDown.Maximum = new decimal(new int[] {
     
    234234      // tabControl
    235235      //
    236       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    237                   | System.Windows.Forms.AnchorStyles.Left)
    238                   | System.Windows.Forms.AnchorStyles.Right)));
     236      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     237            | System.Windows.Forms.AnchorStyles.Left)
     238            | System.Windows.Forms.AnchorStyles.Right)));
    239239      this.tabControl.Controls.Add(this.parametersTabPage);
    240240      this.tabControl.Controls.Add(this.instancesTabPage);
     
    287287      this.parametersListView.MultiSelect = false;
    288288      this.parametersListView.Name = "parametersListView";
     289      this.parametersListView.ShowItemToolTips = true;
    289290      this.parametersListView.Size = new System.Drawing.Size(155, 285);
    290291      this.parametersListView.TabIndex = 0;
     
    310311      // stringConvertibleArrayView
    311312      //
    312       this.stringConvertibleArrayView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    313                   | System.Windows.Forms.AnchorStyles.Left)
    314                   | System.Windows.Forms.AnchorStyles.Right)));
     313      this.stringConvertibleArrayView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     314            | System.Windows.Forms.AnchorStyles.Left)
     315            | System.Windows.Forms.AnchorStyles.Right)));
    315316      this.stringConvertibleArrayView.Caption = "StringConvertibleArray View";
    316317      this.stringConvertibleArrayView.Content = null;
     
    332333      // choicesListView
    333334      //
    334       this.choicesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    335                   | System.Windows.Forms.AnchorStyles.Left)
    336                   | System.Windows.Forms.AnchorStyles.Right)));
     335      this.choicesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     336            | System.Windows.Forms.AnchorStyles.Left)
     337            | System.Windows.Forms.AnchorStyles.Right)));
    337338      this.choicesListView.CheckBoxes = true;
    338339      this.choicesListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
     
    378379      // instancesTreeView
    379380      //
    380       this.instancesTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    381                   | System.Windows.Forms.AnchorStyles.Left)
    382                   | System.Windows.Forms.AnchorStyles.Right)));
     381      this.instancesTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     382            | System.Windows.Forms.AnchorStyles.Left)
     383            | System.Windows.Forms.AnchorStyles.Right)));
    383384      this.instancesTreeView.CheckBoxes = true;
    384385      this.instancesTreeView.Location = new System.Drawing.Point(6, 35);
     
    422423      // experimentCreationProgressBar
    423424      //
    424       this.experimentCreationProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
    425                   | System.Windows.Forms.AnchorStyles.Right)));
     425      this.experimentCreationProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
     426            | System.Windows.Forms.AnchorStyles.Right)));
    426427      this.experimentCreationProgressBar.Location = new System.Drawing.Point(187, 377);
    427428      this.experimentCreationProgressBar.Name = "experimentCreationProgressBar";
  • stable/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

    r13885 r13911  
    5656    private bool createBatchRun;
    5757    private int repetitions;
    58     private Dictionary<IProblemInstanceProvider, HashSet<IDataDescriptor>> instances;
    59     private Dictionary<IValueParameter, IntArray> intParameters;
    60     private Dictionary<IValueParameter, DoubleArray> doubleParameters;
    61     private HashSet<IValueParameter> boolParameters;
    62     private Dictionary<IValueParameter, HashSet<IItem>> multipleChoiceParameters;
    63     private IItem optionalNullChoice = new BoolValue(); // any item will do
     58    private readonly Dictionary<IProblemInstanceProvider, HashSet<IDataDescriptor>> instances;
     59    private readonly Dictionary<IValueParameter, IntArray> intParameters;
     60    private readonly Dictionary<IValueParameter, DoubleArray> doubleParameters;
     61    private readonly HashSet<IValueParameter> boolParameters;
     62    private readonly Dictionary<IValueParameter, HashSet<IItem>> multipleChoiceParameters;
     63    private readonly IItem optionalNullChoice = new BoolValue(); // any item will do
    6464
    6565    private StringBuilder failedInstances;
    66     private EventWaitHandle backgroundWorkerWaitHandle = new ManualResetEvent(false);
     66    private readonly EventWaitHandle backgroundWorkerWaitHandle = new ManualResetEvent(false);
    6767    private bool suppressTreeViewEventHandling, suppressCheckAllNoneEventHandling;
    6868
     
    489489            || typeof(OptionalConstrainedValueParameter<>).IsAssignableFrom(param.GetType().GetGenericTypeDefinition())
    490490            || typeof(ConstrainedValueParameter<>).IsAssignableFrom(param.GetType().GetGenericTypeDefinition()))
    491             parametersListView.Items.Add(new ListViewItem(param.Name) { Tag = param });
     491            parametersListView.Items.Add(new ListViewItem(param.Name) { Tag = param, ToolTipText = param.Description });
    492492        }
    493493      }
Note: See TracChangeset for help on using the changeset viewer.