Changeset 14454 for branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman.Views

Timestamp:

12/05/16 16:06:18 (7 years ago)

Author:

abeham

Message:

#2701:

• Worked on MemPR algorithm for permutations
• Refactored TSP

Location:

branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman.Views/3.3

Files:

• HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj (modified) (1 diff)
• TravelingSalesmanProblemView.Designer.cs (modified) (8 diffs)
• TravelingSalesmanProblemView.cs (modified) (6 diffs)
• TravelingSalesmanProblemView.resx (added)

branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman.Views/3.3/HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj

@@ -230 +230 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TravelingSalesmanProblemView.resx">
+      <DependentUpon>TravelingSalesmanProblemView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TravelingSalesmanProblemView.Designer.cs

@@ -45 +45 @@
       this.visualizationTabPage = new System.Windows.Forms.TabPage();
       this.pathTSPTourView = new HeuristicLab.Problems.TravelingSalesman.Views.PathTSPTourView();
+      this.updateDistanceMatrixButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
       this.problemInstanceSplitContainer.Panel1.SuspendLayout();
@@ -60 +61 @@
       // problemInstanceSplitContainer.Panel2
       // 
+      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.updateDistanceMatrixButton);
       this.problemInstanceSplitContainer.Panel2.Controls.Add(this.tabControl);
       // 
@@ -67 +69 @@
       this.parameterCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
       this.parameterCollectionView.Location = new System.Drawing.Point(3, 3);
-      this.parameterCollectionView.Size = new System.Drawing.Size(497, 274);
+      this.parameterCollectionView.Size = new System.Drawing.Size(497, 245);
       // 
       // nameTextBox
@@ -77 +79 @@
       // 
       this.tabControl.AllowDrop = true;
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.tabControl.Controls.Add(this.parametersTabPage);
       this.tabControl.Controls.Add(this.visualizationTabPage);
-      this.tabControl.Location = new System.Drawing.Point(0, 27);
+      this.tabControl.Location = new System.Drawing.Point(0, 56);
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(511, 306);
+      this.tabControl.Size = new System.Drawing.Size(511, 277);
       this.tabControl.TabIndex = 4;
       // 
@@ -94 +96 @@
       this.parametersTabPage.Name = "parametersTabPage";
       this.parametersTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.parametersTabPage.Size = new System.Drawing.Size(503, 280);
+      this.parametersTabPage.Size = new System.Drawing.Size(503, 251);
       this.parametersTabPage.TabIndex = 0;
       this.parametersTabPage.Text = "Parameters";
@@ -112 +114 @@
       // pathTSPTourView
       // 
-      this.pathTSPTourView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.pathTSPTourView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.pathTSPTourView.Caption = "PathTSPTour View";
       this.pathTSPTourView.Content = null;
@@ -123 +125 @@
       this.pathTSPTourView.TabIndex = 0;
       // 
+      // updateDistanceMatrixButton
+      // 
+      this.updateDistanceMatrixButton.Location = new System.Drawing.Point(3, 27);
+      this.updateDistanceMatrixButton.Name = "updateDistanceMatrixButton";
+      this.updateDistanceMatrixButton.Size = new System.Drawing.Size(133, 23);
+      this.updateDistanceMatrixButton.TabIndex = 5;
+      this.updateDistanceMatrixButton.Text = "Update Distance Matrix";
+      this.updateDistanceMatrixButton.UseVisualStyleBackColor = true;
+      this.updateDistanceMatrixButton.Click += new System.EventHandler(this.updateDistanceMatrixButton_Click);
+      // 
       // TravelingSalesmanProblemView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Name = "TravelingSalesmanProblemView";
@@ -148 +159 @@
     private System.Windows.Forms.TabPage visualizationTabPage;
     private PathTSPTourView pathTSPTourView;
+    private System.Windows.Forms.Button updateDistanceMatrixButton;
   }
 }

branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TravelingSalesmanProblemView.cs

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization.Views;
@@ -46 +47 @@
     protected override void DeregisterContentEvents() {
       Content.CoordinatesParameter.ValueChanged -= new EventHandler(CoordinatesParameter_ValueChanged);
-      Content.BestKnownQualityParameter.ValueChanged -= new EventHandler(BestKnownQualityParameter_ValueChanged);
+      //Content.BestKnownQualityParameter.ValueChanged -= new EventHandler(BestKnownQualityParameter_ValueChanged);
       Content.BestKnownSolutionParameter.ValueChanged -= new EventHandler(BestKnownSolutionParameter_ValueChanged);
       base.DeregisterContentEvents();
@@ -53 +54 @@
       base.RegisterContentEvents();
       Content.CoordinatesParameter.ValueChanged += new EventHandler(CoordinatesParameter_ValueChanged);
-      Content.BestKnownQualityParameter.ValueChanged += new EventHandler(BestKnownQualityParameter_ValueChanged);
+      //Content.BestKnownQualityParameter.ValueChanged += new EventHandler(BestKnownQualityParameter_ValueChanged);
       Content.BestKnownSolutionParameter.ValueChanged += new EventHandler(BestKnownSolutionParameter_ValueChanged);
     }
@@ -62 +63 @@
         pathTSPTourView.Content = null;
       } else {
-        pathTSPTourView.Content = new PathTSPTour(Content.Coordinates, Content.BestKnownSolution, Content.BestKnownQuality);
+        pathTSPTourView.Content = new PathTSPTour(Content.Coordinates, Content.BestKnownSolution, new DoubleValue(Content.BestKnownQuality));
       }
     }
@@ -69 +70 @@
       base.SetEnabledStateOfControls();
       pathTSPTourView.Enabled = Content != null;
+      updateDistanceMatrixButton.Enabled = Content != null && !ReadOnly && !Locked;
     }
 
@@ -75 +77 @@
     }
     private void BestKnownQualityParameter_ValueChanged(object sender, EventArgs e) {
-      pathTSPTourView.Content.Quality = Content.BestKnownQuality;
+      pathTSPTourView.Content.Quality = new DoubleValue(Content.BestKnownQuality);
     }
     private void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) {
       pathTSPTourView.Content.Permutation = Content.BestKnownSolution;
     }
+
+    private void updateDistanceMatrixButton_Click(object sender, EventArgs e) {
+      Content.UpdateDistanceMatrix();
+    }
   }
 }