Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8014 for trunk


Ignore:
Timestamp:
06/16/12 19:51:09 (12 years ago)
Author:
abeham
Message:

#1851:

  • made dialog a bit larger
  • added clearing of the run collection of the cloned optimizer
  • renamed variations tab
Location:
trunk/sources/HeuristicLab.Optimizer/3.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.Designer.cs

    r7985 r8014  
    9595      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    9696      this.okButton.Enabled = false;
    97       this.okButton.Location = new System.Drawing.Point(187, 359);
     97      this.okButton.Location = new System.Drawing.Point(246, 377);
    9898      this.okButton.Name = "okButton";
    9999      this.okButton.Size = new System.Drawing.Size(75, 23);
     
    107107      this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    108108      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    109       this.cancelButton.Location = new System.Drawing.Point(268, 359);
     109      this.cancelButton.Location = new System.Drawing.Point(327, 377);
    110110      this.cancelButton.Name = "cancelButton";
    111111      this.cancelButton.Size = new System.Drawing.Size(75, 23);
     
    161161            0});
    162162      this.repetitionsNumericUpDown.Name = "repetitionsNumericUpDown";
    163       this.repetitionsNumericUpDown.Size = new System.Drawing.Size(230, 20);
     163      this.repetitionsNumericUpDown.Size = new System.Drawing.Size(289, 20);
    164164      this.repetitionsNumericUpDown.TabIndex = 3;
    165165      this.repetitionsNumericUpDown.ThousandsSeparator = true;
     
    242242      this.tabControl.Name = "tabControl";
    243243      this.tabControl.SelectedIndex = 0;
    244       this.tabControl.Size = new System.Drawing.Size(328, 299);
     244      this.tabControl.Size = new System.Drawing.Size(387, 317);
    245245      this.tabControl.TabIndex = 4;
    246246      //
     
    251251      this.parametersTabPage.Name = "parametersTabPage";
    252252      this.parametersTabPage.Padding = new System.Windows.Forms.Padding(3);
    253       this.parametersTabPage.Size = new System.Drawing.Size(320, 273);
     253      this.parametersTabPage.Size = new System.Drawing.Size(379, 291);
    254254      this.parametersTabPage.TabIndex = 1;
    255       this.parametersTabPage.Text = "Parameters Variation";
     255      this.parametersTabPage.Text = "Parameter Variations";
    256256      this.parametersTabPage.UseVisualStyleBackColor = true;
    257257      //
     
    273273      this.parametersSplitContainer.Panel2.Controls.Add(this.detailsTypeLabel);
    274274      this.parametersSplitContainer.Panel2.Controls.Add(this.choicesListView);
    275       this.parametersSplitContainer.Size = new System.Drawing.Size(314, 267);
    276       this.parametersSplitContainer.SplitterDistance = 124;
     275      this.parametersSplitContainer.Size = new System.Drawing.Size(373, 285);
     276      this.parametersSplitContainer.SplitterDistance = 155;
    277277      this.parametersSplitContainer.TabIndex = 1;
    278278      //
     
    287287      this.parametersListView.MultiSelect = false;
    288288      this.parametersListView.Name = "parametersListView";
    289       this.parametersListView.Size = new System.Drawing.Size(124, 267);
     289      this.parametersListView.Size = new System.Drawing.Size(155, 285);
    290290      this.parametersListView.TabIndex = 0;
    291291      this.parametersListView.UseCompatibleStateImageBehavior = false;
     
    318318      this.stringConvertibleArrayView.Name = "stringConvertibleArrayView";
    319319      this.stringConvertibleArrayView.ReadOnly = false;
    320       this.stringConvertibleArrayView.Size = new System.Drawing.Size(155, 215);
     320      this.stringConvertibleArrayView.Size = new System.Drawing.Size(183, 233);
    321321      this.stringConvertibleArrayView.TabIndex = 7;
    322322      //
     
    341341      this.choicesListView.Location = new System.Drawing.Point(16, 34);
    342342      this.choicesListView.Name = "choicesListView";
    343       this.choicesListView.Size = new System.Drawing.Size(155, 220);
     343      this.choicesListView.Size = new System.Drawing.Size(183, 238);
    344344      this.choicesListView.TabIndex = 6;
    345345      this.choicesListView.UseCompatibleStateImageBehavior = false;
     
    392392      this.experimentsToCreateDescriptionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    393393      this.experimentsToCreateDescriptionLabel.AutoSize = true;
    394       this.experimentsToCreateDescriptionLabel.Location = new System.Drawing.Point(12, 364);
     394      this.experimentsToCreateDescriptionLabel.Location = new System.Drawing.Point(12, 382);
    395395      this.experimentsToCreateDescriptionLabel.Name = "experimentsToCreateDescriptionLabel";
    396396      this.experimentsToCreateDescriptionLabel.Size = new System.Drawing.Size(56, 13);
     
    402402      this.variationsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    403403      this.variationsLabel.AutoSize = true;
    404       this.variationsLabel.Location = new System.Drawing.Point(74, 364);
     404      this.variationsLabel.Location = new System.Drawing.Point(74, 382);
    405405      this.variationsLabel.Name = "variationsLabel";
    406406      this.variationsLabel.Size = new System.Drawing.Size(13, 13);
     
    424424      this.experimentCreationProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
    425425                  | System.Windows.Forms.AnchorStyles.Right)));
    426       this.experimentCreationProgressBar.Location = new System.Drawing.Point(187, 359);
     426      this.experimentCreationProgressBar.Location = new System.Drawing.Point(187, 377);
    427427      this.experimentCreationProgressBar.Name = "experimentCreationProgressBar";
    428       this.experimentCreationProgressBar.Size = new System.Drawing.Size(75, 23);
     428      this.experimentCreationProgressBar.Size = new System.Drawing.Size(134, 23);
    429429      this.experimentCreationProgressBar.TabIndex = 9;
    430430      this.experimentCreationProgressBar.Visible = false;
     
    435435      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    436436      this.CancelButton = this.cancelButton;
    437       this.ClientSize = new System.Drawing.Size(355, 394);
     437      this.ClientSize = new System.Drawing.Size(414, 412);
    438438      this.Controls.Add(this.experimentCreationProgressBar);
    439439      this.Controls.Add(this.variationsLabel);
  • trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

    r8013 r8014  
    413413        variationsLabel.Visible = true;
    414414        experimentsToCreateDescriptionLabel.Visible = true;
    415         Height = 430;
     415        Height = 450;
    416416      } else {
    417417        variationsLabel.Visible = false;
     
    745745    private IEnumerable<IOptimizer> experimentCreationBackgroundWorker_CalculateParameterVariations(IOptimizer optimizer) {
    746746      if (!boolParameters.Any() && !intParameters.Any() && !doubleParameters.Any() && !multipleChoiceParameters.Any()) {
    747         yield return (IOptimizer)optimizer.Clone();
     747        var o = (IOptimizer)optimizer.Clone();
     748        o.Runs.Clear();
     749        yield return o;
    748750        yield break;
    749751      }
     
    756758      do {
    757759        var variant = (IAlgorithm)optimizer.Clone();
     760        variant.Runs.Clear();
    758761        variant.Name += " {";
    759762        finished = true;
Note: See TracChangeset for help on using the changeset viewer.