Changeset 7040 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding.Views

Timestamp:

11/22/11 14:54:17 (13 years ago)

Author:

abeham

Message:

#1541

• Fixed permutation view and changed label
• Fixed problem in the RTS operator when all moves are tabu (the original code continues when all moves are tabu, so this is also the case here)
• Changed the Analyzer parameter type in RTS, a FixedValueParameter is not appropriate for operator parameters

Location:

trunk/sources/HeuristicLab.Encodings.PermutationEncoding.Views/3.3

Files:

• PermutationTypeView.Designer.cs (modified) (3 diffs)
• PermutationView.Designer.cs (modified) (1 diff)
• PermutationView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationTypeView.Designer.cs

@@ -54 +54 @@
       this.valueLabel.Location = new System.Drawing.Point(3, 3);
       this.valueLabel.Name = "valueLabel";
-      this.valueLabel.Size = new System.Drawing.Size(37, 13);
+      this.valueLabel.Size = new System.Drawing.Size(34, 13);
       this.valueLabel.TabIndex = 0;
-      this.valueLabel.Text = "&Value:";
+      this.valueLabel.Text = "&Type:";
       // 
       // valueComboBox
@@ -71 +71 @@
       this.valueComboBox.SelectedIndexChanged += new System.EventHandler(this.valueComboBox_SelectedIndexChanged);
       // 
-      // ComparisonView
+      // PermutationTypeView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -77 +77 @@
       this.Controls.Add(this.valueComboBox);
       this.Controls.Add(this.valueLabel);
-      this.Name = "ComparisonView";
+      this.Name = "PermutationTypeView";
       this.Size = new System.Drawing.Size(265, 29);
       this.ResumeLayout(false);

trunk/sources/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationView.Designer.cs

@@ -72 +72 @@
       this.Controls.Add(this.permutationTypeView);
       this.Name = "PermutationView";
-      this.Controls.SetChildIndex(this.permutationTypeView, 0);
       this.Controls.SetChildIndex(this.lengthLabel, 0);
       this.Controls.SetChildIndex(this.lengthTextBox, 0);
+      this.Controls.SetChildIndex(this.permutationTypeView, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);

trunk/sources/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationView.cs

@@ -37 +37 @@
       InitializeComponent();
       dataGridView.Top = permutationTypeView.Bottom + permutationTypeView.Margin.Bottom + dataGridView.Margin.Top;
+      dataGridView.Height = Bottom - dataGridView.Top;
     }