Changeset 17335 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP.Views

Timestamp:

10/17/19 21:40:30 (5 years ago)

Author:

abeham

Message:

#2521: Refactored pTSP to use compositional pattern

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP.Views/3.3

Files:

• HeuristicLab.Problems.PTSP.Views-3.3.csproj (modified) (2 diffs)
• ProbabilisticTSPDataView.Designer.cs (added)
• ProbabilisticTSPDataView.cs (added)
• ProbabilisticTSPSolutionView.cs (modified) (3 diffs)
• ProbabilisticTSPVisualizer.cs (added)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP.Views/3.3/HeuristicLab.Problems.PTSP.Views-3.3.csproj

@@ -172 +172 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CoordinatesPTSPDataView.cs">
+    <Compile Include="ProbabilisticTSPDataView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="CoordinatesPTSPDataView.Designer.cs">
-      <DependentUpon>CoordinatesPTSPDataView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="EuclideanPTSPDataView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="EuclideanPTSPDataView.Designer.cs">
-      <DependentUpon>EuclideanPTSPDataView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MatrixPTSPDataView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="MatrixPTSPDataView.Designer.cs">
-      <DependentUpon>MatrixPTSPDataView.cs</DependentUpon>
+    <Compile Include="ProbabilisticTSPDataView.Designer.cs">
+      <DependentUpon>ProbabilisticTSPDataView.cs</DependentUpon>
     </Compile>
     <Compile Include="ProbabilisticTSPSolutionView.cs">
@@ -198 +186 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ProbabilisticTSPVisualizer.cs" />
   </ItemGroup>
   <ItemGroup>

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP.Views/3.3/ProbabilisticTSPSolutionView.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
+using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
@@ -31 +32 @@
   /// The base class for visual representations of a path tour for a PTSP.
   /// </summary>
-  [View("PathPTSPTour View")]
+  [View("pTSP Solution View")]
   [Content(typeof(IProbabilisticTSPSolution), true)]
-  public sealed partial class ProbabilisticTSPSolutionView : TSPSolutionView {
+  public sealed partial class ProbabilisticTSPSolutionView : ItemView {
+    public TSPVisualizer Visualizer { get; set; }
+
     public new IProbabilisticTSPSolution Content {
       get { return (IProbabilisticTSPSolution)base.Content; }
@@ -44 +47 @@
     public ProbabilisticTSPSolutionView() {
       InitializeComponent();
-    }
-
-    protected override void GenerateImage() {
-      if ((pictureBox.Width > 0) && (pictureBox.Height > 0)) {
-        if (Content == null) {
-          pictureBox.Image = null;
-        } else {
-          DoubleMatrix coordinates = Content.Coordinates;
-          Permutation permutation = Content.Tour;
-          DoubleArray probabilities = Content.Probabilities;
-          Bitmap bitmap = new Bitmap(pictureBox.Width, pictureBox.Height);
-
-          if ((coordinates != null) && (coordinates.Rows > 0) && (coordinates.Columns == 2) && (probabilities.Length == coordinates.Rows)) {
-            double xMin = double.MaxValue, yMin = double.MaxValue, xMax = double.MinValue, yMax = double.MinValue;
-            for (int i = 0; i < coordinates.Rows; i++) {
-              if (xMin > coordinates[i, 0]) xMin = coordinates[i, 0];
-              if (yMin > coordinates[i, 1]) yMin = coordinates[i, 1];
-              if (xMax < coordinates[i, 0]) xMax = coordinates[i, 0];
-              if (yMax < coordinates[i, 1]) yMax = coordinates[i, 1];
-            }
-
-            int border = 20;
-            double xStep = xMax != xMin ? (pictureBox.Width - 2 * border) / (xMax - xMin) : 1;
-            double yStep = yMax != yMin ? (pictureBox.Height - 2 * border) / (yMax - yMin) : 1;
-
-            Point[] points = new Point[coordinates.Rows];
-            for (int i = 0; i < coordinates.Rows; i++)
-              points[i] = new Point(border + ((int)((coordinates[i, 0] - xMin) * xStep)),
-                                    bitmap.Height - (border + ((int)((coordinates[i, 1] - yMin) * yStep))));
-
-            using (Graphics graphics = Graphics.FromImage(bitmap)) {
-              if (permutation != null && permutation.Length > 1) {
-                Point[] tour = new Point[permutation.Length];
-                for (int i = 0; i < permutation.Length; i++) {
-                  if (permutation[i] >= 0 && permutation[i] < points.Length)
-                    tour[i] = points[permutation[i]];
-                }
-                graphics.DrawPolygon(Pens.Black, tour);
-              }
-              for (int i = 0; i < points.Length; i++)
-                graphics.FillRectangle(Brushes.Red, points[i].X - 2, points[i].Y - 2, Convert.ToInt32(probabilities[i] * 20), Convert.ToInt32(probabilities[i] * 20));
-            }
-          } else {
-            using (Graphics graphics = Graphics.FromImage(bitmap)) {
-              graphics.Clear(Color.White);
-              Font font = new Font(FontFamily.GenericSansSerif, 12, FontStyle.Regular);
-              string text = "No coordinates defined or in wrong format.";
-              SizeF strSize = graphics.MeasureString(text, font);
-              graphics.DrawString(text, font, Brushes.Black, (float)(pictureBox.Width - strSize.Width) / 2.0f, (float)(pictureBox.Height - strSize.Height) / 2.0f);
-            }
-          }
-          pictureBox.Image = bitmap;
-        }
-      }
+      Visualizer = new ProbabilisticTSPVisualizer();
     }
   }