Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/22/12 11:11:38 (12 years ago)
Author:
jkarder
Message:

#1331:

  • synced branch with trunk
  • added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
  • similarity calculators are now parameterized by the algorithm
  • deleted SolutionPool2TierUpdateMethod
  • deleted KnapsackMultipleGuidesPathRelinker
  • moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
  • added parameter descriptions
  • fixed plugin references
  • fixed count of EvaluatedSolutions
  • fixed check for duplicate solutions
  • minor code improvements
Location:
branches/ScatterSearch (trunk integration)
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/ScatterSearch (trunk integration)

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

    r7641 r8086  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.problemInstanceProviderComboBox = new System.Windows.Forms.ComboBox();
    48       this.libraryLabel = new System.Windows.Forms.Label();
    49       this.libraryInfoButton = new System.Windows.Forms.Button();
    5047      this.problemInstanceSplitContainer = new System.Windows.Forms.SplitContainer();
    51       this.problemInstanceProviderViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     48      this.ProblemInstanceConsumerViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    5249      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5350      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
    … …  
    7774      this.infoLabel.Location = new System.Drawing.Point(491, 4);
    7875      //
    79       // problemInstanceProviderComboBox
    80       //
    81       this.problemInstanceProviderComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    82       this.problemInstanceProviderComboBox.FormattingEnabled = true;
    83       this.problemInstanceProviderComboBox.Location = new System.Drawing.Point(47, 2);
    84       this.problemInstanceProviderComboBox.Name = "problemInstanceProviderComboBox";
    85       this.problemInstanceProviderComboBox.Size = new System.Drawing.Size(171, 21);
    86       this.problemInstanceProviderComboBox.TabIndex = 13;
    87       this.problemInstanceProviderComboBox.SelectedIndexChanged += new System.EventHandler(this.problemInstanceProviderComboBox_SelectedIndexChanged);
    88       this.problemInstanceProviderComboBox.DataSourceChanged += new System.EventHandler(this.comboBox_DataSourceChanged);
    89       //
    90       // libraryLabel
    91       //
    92       this.libraryLabel.AutoSize = true;
    93       this.libraryLabel.Location = new System.Drawing.Point(3, 6);
    94       this.libraryLabel.Name = "libraryLabel";
    95       this.libraryLabel.Size = new System.Drawing.Size(41, 13);
    96       this.libraryLabel.TabIndex = 12;
    97       this.libraryLabel.Text = "Library:";
    98       //
    99       // libraryInfoButton
    100       //
    101       this.libraryInfoButton.Location = new System.Drawing.Point(224, 1);
    102       this.libraryInfoButton.Name = "libraryInfoButton";
    103       this.libraryInfoButton.Size = new System.Drawing.Size(26, 23);
    104       this.libraryInfoButton.TabIndex = 14;
    105       this.libraryInfoButton.Text = "Info";
    106       this.libraryInfoButton.UseVisualStyleBackColor = true;
    107       this.libraryInfoButton.Click += new System.EventHandler(this.libraryInfoButton_Click);
    108       //
    10976      // problemInstanceSplitContainer
    11077      //
    111       this.problemInstanceSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    112                   | System.Windows.Forms.AnchorStyles.Left)
    113                   | System.Windows.Forms.AnchorStyles.Right)));
     78      this.problemInstanceSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     79            | System.Windows.Forms.AnchorStyles.Left)
     80            | System.Windows.Forms.AnchorStyles.Right)));
    11481      this.problemInstanceSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
    11582      this.problemInstanceSplitContainer.IsSplitterFixed = true;
    … …  
    12087      // problemInstanceSplitContainer.Panel1
    12188      //
    122       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.problemInstanceProviderViewHost);
    123       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.problemInstanceProviderComboBox);
    124       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.libraryInfoButton);
    125       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.libraryLabel);
     89      this.problemInstanceSplitContainer.Panel1.Controls.Add(this.ProblemInstanceConsumerViewHost);
    12690      this.problemInstanceSplitContainer.Panel1MinSize = 10;
    12791      //
    … …  
    136100      this.problemInstanceSplitContainer.TabIndex = 13;
    137101      //
    138       // problemInstanceProviderViewHost
     102      // ProblemInstanceConsumerViewHost
    139103      //
    140       this.problemInstanceProviderViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    141                   | System.Windows.Forms.AnchorStyles.Right)));
    142       this.problemInstanceProviderViewHost.Caption = "View";
    143       this.problemInstanceProviderViewHost.Content = null;
    144       this.problemInstanceProviderViewHost.Enabled = false;
    145       this.problemInstanceProviderViewHost.Location = new System.Drawing.Point(256, 3);
    146       this.problemInstanceProviderViewHost.Name = "problemInstanceProviderViewHost";
    147       this.problemInstanceProviderViewHost.ReadOnly = false;
    148       this.problemInstanceProviderViewHost.Size = new System.Drawing.Size(251, 22);
    149       this.problemInstanceProviderViewHost.TabIndex = 15;
    150       this.problemInstanceProviderViewHost.ViewsLabelVisible = false;
    151       this.problemInstanceProviderViewHost.ViewType = null;
     104      this.ProblemInstanceConsumerViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     105            | System.Windows.Forms.AnchorStyles.Left)
     106            | System.Windows.Forms.AnchorStyles.Right)));
     107      this.ProblemInstanceConsumerViewHost.Caption = "ProblemInstanceConsumerView";
     108      this.ProblemInstanceConsumerViewHost.Content = null;
     109      this.ProblemInstanceConsumerViewHost.Enabled = false;
     110      this.ProblemInstanceConsumerViewHost.Location = new System.Drawing.Point(0, 1);
     111      this.ProblemInstanceConsumerViewHost.Name = "ProblemInstanceConsumerViewHost";
     112      this.ProblemInstanceConsumerViewHost.ReadOnly = false;
     113      this.ProblemInstanceConsumerViewHost.Size = new System.Drawing.Size(511, 23);
     114      this.ProblemInstanceConsumerViewHost.TabIndex = 0;
     115      this.ProblemInstanceConsumerViewHost.ViewsLabelVisible = false;
     116      this.ProblemInstanceConsumerViewHost.ViewType = null;
    152117      //
    153118      // ProblemView
    154119      //
    155120      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    156       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     121      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    157122      this.Controls.Add(this.problemInstanceSplitContainer);
    158123      this.Name = "ProblemView";
    … …  
    160125      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    161126      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
    162       this.problemInstanceSplitContainer.Panel1.PerformLayout();
    163127      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
    164128      this.problemInstanceSplitContainer.Panel2.PerformLayout();
    … …  
    171135    #endregion
    172136
    173     protected System.Windows.Forms.ComboBox problemInstanceProviderComboBox;
    174     protected System.Windows.Forms.Label libraryLabel;
    175     protected System.Windows.Forms.Button libraryInfoButton;
    176137    protected System.Windows.Forms.SplitContainer problemInstanceSplitContainer;
    177     protected MainForm.WindowsForms.ViewHost problemInstanceProviderViewHost;
     138    protected HeuristicLab.MainForm.WindowsForms.ViewHost ProblemInstanceConsumerViewHost;
    178139  }
    179140}
Note: See TracChangeset for help on using the changeset viewer.