Changeset 13751 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views

Timestamp:

04/11/16 17:34:50 (8 years ago)

Author:

abeham

Message:

#2457: worked on problem instance mapping

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views

Files:

• KnowledgeCenterAllinOneView.cs (modified) (1 diff)
• UnderstandingProblemInstanceView.Designer.cs (modified) (6 diffs)
• UnderstandingProblemInstanceView.cs (modified) (6 diffs)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/KnowledgeCenterAllinOneView.cs

@@ -271 +271 @@
           Label = run.Name
         };
-        instancesSeries.Points.Add(dataPoint);
-      }
-
-      var curPoint = Content.ProjectCurrentInstance(projection);
-      if (curPoint != null) {
-        var dp = new DataPoint(curPoint.Item1, curPoint.Item2) {
-          Label = Content.Problem.Problem.Name
-        };
-        currentInstanceSeries.Points.Add(dp);
+        if (!Content.IsCurrentInstance(run)) instancesSeries.Points.Add(dataPoint);
+        else currentInstanceSeries.Points.Add(dataPoint);
       }
     }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/UnderstandingProblemInstanceView.Designer.cs

@@ -50 +50 @@
       System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
       System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
-      this.projectionLabel = new System.Windows.Forms.Label();
-      this.projectionComboBox = new System.Windows.Forms.ComboBox();
       this.problemInstancesTabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
       this.mapTabPage = new System.Windows.Forms.TabPage();
-      this.instanceMapChart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
       this.instancesTabPage = new System.Windows.Forms.TabPage();
       this.problemInstancesView = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.mapSplitContainer = new System.Windows.Forms.SplitContainer();
+      this.invPropCheckBox = new System.Windows.Forms.CheckBox();
+      this.sizeLabel = new System.Windows.Forms.Label();
+      this.projectionLabel = new System.Windows.Forms.Label();
+      this.instanceMapChart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
+      this.sizeComboBox = new System.Windows.Forms.ComboBox();
+      this.projectionComboBox = new System.Windows.Forms.ComboBox();
+      this.showCharacteristicsCheckBox = new System.Windows.Forms.CheckBox();
       this.problemInstancesTabControl.SuspendLayout();
       this.mapTabPage.SuspendLayout();
+      this.instancesTabPage.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.mapSplitContainer)).BeginInit();
+      this.mapSplitContainer.Panel1.SuspendLayout();
+      this.mapSplitContainer.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.instanceMapChart)).BeginInit();
-      this.instancesTabPage.SuspendLayout();
       this.SuspendLayout();
-      // 
-      // projectionLabel
-      // 
-      this.projectionLabel.AutoSize = true;
-      this.projectionLabel.Location = new System.Drawing.Point(6, 9);
-      this.projectionLabel.Name = "projectionLabel";
-      this.projectionLabel.Size = new System.Drawing.Size(57, 13);
-      this.projectionLabel.TabIndex = 10;
-      this.projectionLabel.Text = "Projection:";
-      // 
-      // projectionComboBox
-      // 
-      this.projectionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.projectionComboBox.FormattingEnabled = true;
-      this.projectionComboBox.Location = new System.Drawing.Point(69, 6);
-      this.projectionComboBox.Name = "projectionComboBox";
-      this.projectionComboBox.Size = new System.Drawing.Size(158, 21);
-      this.projectionComboBox.TabIndex = 9;
-      this.projectionComboBox.SelectedIndexChanged += new System.EventHandler(this.ProjectionComboBoxOnSelectedIndexChanged);
       // 
       // problemInstancesTabControl
@@ -98 +87 @@
       // mapTabPage
       // 
-      this.mapTabPage.Controls.Add(this.projectionLabel);
-      this.mapTabPage.Controls.Add(this.instanceMapChart);
-      this.mapTabPage.Controls.Add(this.projectionComboBox);
+      this.mapTabPage.Controls.Add(this.mapSplitContainer);
       this.mapTabPage.Location = new System.Drawing.Point(4, 22);
       this.mapTabPage.Name = "mapTabPage";
@@ -108 +95 @@
       this.mapTabPage.Text = "Map";
       this.mapTabPage.UseVisualStyleBackColor = true;
+      // 
+      // instancesTabPage
+      // 
+      this.instancesTabPage.Controls.Add(this.problemInstancesView);
+      this.instancesTabPage.Location = new System.Drawing.Point(4, 22);
+      this.instancesTabPage.Name = "instancesTabPage";
+      this.instancesTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.instancesTabPage.Size = new System.Drawing.Size(992, 734);
+      this.instancesTabPage.TabIndex = 0;
+      this.instancesTabPage.Text = "Instances";
+      this.instancesTabPage.UseVisualStyleBackColor = true;
+      // 
+      // problemInstancesView
+      // 
+      this.problemInstancesView.Caption = "View";
+      this.problemInstancesView.Content = null;
+      this.problemInstancesView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.problemInstancesView.Enabled = false;
+      this.problemInstancesView.Location = new System.Drawing.Point(3, 3);
+      this.problemInstancesView.Name = "problemInstancesView";
+      this.problemInstancesView.ReadOnly = false;
+      this.problemInstancesView.Size = new System.Drawing.Size(986, 728);
+      this.problemInstancesView.TabIndex = 0;
+      this.problemInstancesView.ViewsLabelVisible = true;
+      this.problemInstancesView.ViewType = null;
+      // 
+      // mapSplitContainer
+      // 
+      this.mapSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.mapSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+      this.mapSplitContainer.Location = new System.Drawing.Point(3, 3);
+      this.mapSplitContainer.Name = "mapSplitContainer";
+      // 
+      // mapSplitContainer.Panel1
+      // 
+      this.mapSplitContainer.Panel1.Controls.Add(this.showCharacteristicsCheckBox);
+      this.mapSplitContainer.Panel1.Controls.Add(this.invPropCheckBox);
+      this.mapSplitContainer.Panel1.Controls.Add(this.sizeLabel);
+      this.mapSplitContainer.Panel1.Controls.Add(this.projectionLabel);
+      this.mapSplitContainer.Panel1.Controls.Add(this.instanceMapChart);
+      this.mapSplitContainer.Panel1.Controls.Add(this.sizeComboBox);
+      this.mapSplitContainer.Panel1.Controls.Add(this.projectionComboBox);
+      this.mapSplitContainer.Panel1.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0);
+      this.mapSplitContainer.Size = new System.Drawing.Size(986, 728);
+      this.mapSplitContainer.SplitterDistance = 847;
+      this.mapSplitContainer.TabIndex = 12;
+      // 
+      // invPropCheckBox
+      // 
+      this.invPropCheckBox.AutoSize = true;
+      this.invPropCheckBox.Checked = true;
+      this.invPropCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
+      this.invPropCheckBox.Location = new System.Drawing.Point(579, 12);
+      this.invPropCheckBox.Name = "invPropCheckBox";
+      this.invPropCheckBox.Size = new System.Drawing.Size(118, 17);
+      this.invPropCheckBox.TabIndex = 17;
+      this.invPropCheckBox.Text = "inverse proportional";
+      this.invPropCheckBox.UseVisualStyleBackColor = true;
+      // 
+      // sizeLabel
+      // 
+      this.sizeLabel.AutoSize = true;
+      this.sizeLabel.Location = new System.Drawing.Point(264, 12);
+      this.sizeLabel.Name = "sizeLabel";
+      this.sizeLabel.Size = new System.Drawing.Size(30, 13);
+      this.sizeLabel.TabIndex = 15;
+      this.sizeLabel.Text = "Size:";
+      // 
+      // projectionLabel
+      // 
+      this.projectionLabel.AutoSize = true;
+      this.projectionLabel.Location = new System.Drawing.Point(2, 12);
+      this.projectionLabel.Name = "projectionLabel";
+      this.projectionLabel.Size = new System.Drawing.Size(57, 13);
+      this.projectionLabel.TabIndex = 16;
+      this.projectionLabel.Text = "Projection:";
       // 
       // instanceMapChart
@@ -140 +203 @@
       this.instanceMapChart.Series.Add(series1);
       this.instanceMapChart.Series.Add(series2);
-      this.instanceMapChart.Size = new System.Drawing.Size(986, 698);
-      this.instanceMapChart.TabIndex = 0;
-      // 
-      // instancesTabPage
-      // 
-      this.instancesTabPage.Controls.Add(this.problemInstancesView);
-      this.instancesTabPage.Location = new System.Drawing.Point(4, 22);
-      this.instancesTabPage.Name = "instancesTabPage";
-      this.instancesTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.instancesTabPage.Size = new System.Drawing.Size(1044, 757);
-      this.instancesTabPage.TabIndex = 0;
-      this.instancesTabPage.Text = "Instances";
-      this.instancesTabPage.UseVisualStyleBackColor = true;
-      // 
-      // problemInstancesView
-      // 
-      this.problemInstancesView.Caption = "View";
-      this.problemInstancesView.Content = null;
-      this.problemInstancesView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.problemInstancesView.Enabled = false;
-      this.problemInstancesView.Location = new System.Drawing.Point(3, 3);
-      this.problemInstancesView.Name = "problemInstancesView";
-      this.problemInstancesView.ReadOnly = false;
-      this.problemInstancesView.Size = new System.Drawing.Size(1038, 751);
-      this.problemInstancesView.TabIndex = 0;
-      this.problemInstancesView.ViewsLabelVisible = true;
-      this.problemInstancesView.ViewType = null;
+      this.instanceMapChart.Size = new System.Drawing.Size(841, 692);
+      this.instanceMapChart.TabIndex = 12;
+      // 
+      // sizeComboBox
+      // 
+      this.sizeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.sizeComboBox.FormattingEnabled = true;
+      this.sizeComboBox.Location = new System.Drawing.Point(300, 6);
+      this.sizeComboBox.Name = "sizeComboBox";
+      this.sizeComboBox.Size = new System.Drawing.Size(273, 21);
+      this.sizeComboBox.TabIndex = 13;
+      // 
+      // projectionComboBox
+      // 
+      this.projectionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.projectionComboBox.FormattingEnabled = true;
+      this.projectionComboBox.Location = new System.Drawing.Point(65, 6);
+      this.projectionComboBox.Name = "projectionComboBox";
+      this.projectionComboBox.Size = new System.Drawing.Size(158, 21);
+      this.projectionComboBox.TabIndex = 14;
+      // 
+      // showCharacteristicsCheckBox
+      // 
+      this.showCharacteristicsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.showCharacteristicsCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
+      this.showCharacteristicsCheckBox.Location = new System.Drawing.Point(818, 4);
+      this.showCharacteristicsCheckBox.Name = "showCharacteristicsCheckBox";
+      this.showCharacteristicsCheckBox.Size = new System.Drawing.Size(26, 23);
+      this.showCharacteristicsCheckBox.TabIndex = 18;
+      this.showCharacteristicsCheckBox.Text = "Detail";
+      this.showCharacteristicsCheckBox.UseVisualStyleBackColor = true;
       // 
       // UnderstandingProblemInstanceView
@@ -175 +242 @@
       this.Name = "UnderstandingProblemInstanceView";
       this.Size = new System.Drawing.Size(1000, 760);
-      this.Controls.SetChildIndex(this.problemInstancesTabControl, 0);
       this.problemInstancesTabControl.ResumeLayout(false);
       this.mapTabPage.ResumeLayout(false);
-      this.mapTabPage.PerformLayout();
+      this.instancesTabPage.ResumeLayout(false);
+      this.mapSplitContainer.Panel1.ResumeLayout(false);
+      this.mapSplitContainer.Panel1.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.mapSplitContainer)).EndInit();
+      this.mapSplitContainer.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.instanceMapChart)).EndInit();
-      this.instancesTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -187 +256 @@
     #endregion
 
-    private System.Windows.Forms.Label projectionLabel;
-    private System.Windows.Forms.ComboBox projectionComboBox;
     private MainForm.WindowsForms.DragOverTabControl problemInstancesTabControl;
     private System.Windows.Forms.TabPage mapTabPage;
-    private Visualization.ChartControlsExtensions.EnhancedChart instanceMapChart;
     private System.Windows.Forms.TabPage instancesTabPage;
     private MainForm.WindowsForms.ViewHost problemInstancesView;
+    private System.Windows.Forms.SplitContainer mapSplitContainer;
+    private System.Windows.Forms.CheckBox showCharacteristicsCheckBox;
+    private System.Windows.Forms.CheckBox invPropCheckBox;
+    private System.Windows.Forms.Label sizeLabel;
+    private System.Windows.Forms.Label projectionLabel;
+    private Visualization.ChartControlsExtensions.EnhancedChart instanceMapChart;
+    private System.Windows.Forms.ComboBox sizeComboBox;
+    private System.Windows.Forms.ComboBox projectionComboBox;
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Views/UnderstandingProblemInstanceView.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 using HeuristicLab.OptimizationExpertSystem.Common;
@@ -31 +32 @@
   [View("Understanding Problem Instance")]
   [Content(typeof(KnowledgeCenter), IsDefaultView = false)]
-  public partial class UnderstandingProblemInstanceView : KnowledgeCenterViewBase {
+  public sealed partial class UnderstandingProblemInstanceView : KnowledgeCenterViewBase {
+    private bool SuppressEvents { get; set; }
+
     public UnderstandingProblemInstanceView() {
       InitializeComponent();
@@ -45 +48 @@
         problemInstancesView.Content = Content.ProblemInstances;
         UpdateProjectionComboBox();
+        UpdateSizeComboBox();
       }
     }
@@ -58 +62 @@
       if (Content.ProblemInstances.UpdateOfRunsInProgress) return;
       UpdateProjectionComboBox();
+      UpdateSizeComboBox();
+      UpdateProjection();
+    }
+    #endregion
+
+    private void UpdateProjectionComboBox() {
+      try {
+        SuppressEvents = true;
+        var selected = projectionComboBox.SelectedIndex >= 0 ? (string)projectionComboBox.SelectedItem : null;
+        projectionComboBox.Items.Clear();
+        foreach (var str in GetProjections()) {
+          projectionComboBox.Items.Add(str);
+          if (selected == str) projectionComboBox.SelectedItem = str;
+        }
+        if (selected == null && projectionComboBox.Items.Count > 0)
+          projectionComboBox.SelectedIndex = 0;
+      } finally { SuppressEvents = false; }
     }
 
-    protected override void OnDownloadEnded() {
-      base.OnDownloadEnded();
-      UpdateProjectionComboBox();
+    private void UpdateSizeComboBox() {
+      try {
+        SuppressEvents = true;
+        var selected = sizeComboBox.SelectedIndex >= 0 ? (string)sizeComboBox.SelectedItem : null;
+        sizeComboBox.Items.Clear();
+        sizeComboBox.Items.Add(string.Empty);
+        foreach (var str in Content.ProblemInstances.ResultNames.Where(x => !(x.StartsWith("Projection.") && (x.EndsWith(".X") || x.EndsWith(".Y"))))) {
+          sizeComboBox.Items.Add(str);
+          if (selected == str) sizeComboBox.SelectedItem = str;
+        }
+        if (selected == null && sizeComboBox.Items.Count > 0)
+          sizeComboBox.SelectedIndex = 0;
+      } finally { SuppressEvents = false; }
     }
-    #endregion
     
-    public IEnumerable<string> GetProjections() {
+    private IEnumerable<string> GetProjections() {
       return Content.ProblemInstances
         .SelectMany(x => x.Results.Where(y => Regex.IsMatch(y.Key, "^Projection[.].*[.][XY]$")))
@@ -73 +103 @@
     }
 
-    public void ProjectProblemInstances(Series instancesSeries, Series currentInstanceSeries, string projection) {
+    private void UpdateProjection() {
+      if (InvokeRequired) { Invoke((Action)UpdateProjection); return; }
+
+      var instancesSeries = instanceMapChart.Series["InstancesSeries"];
+      var currentInstanceSeries = instanceMapChart.Series["CurrentInstanceSeries"];
+
+      if (projectionComboBox.SelectedIndex < 0) {
+        instancesSeries.Points.Clear();
+        currentInstanceSeries.Points.Clear();
+        return;
+      }
+
+      var projection = (string)projectionComboBox.SelectedItem;
+      var size = sizeComboBox.SelectedIndex >= 0 ? (string)sizeComboBox.SelectedItem : string.Empty;
+
+      DoProjectProblemInstances(instancesSeries, currentInstanceSeries, projection, size, invPropCheckBox.Checked);
+    }
+
+    private void DoProjectProblemInstances(Series instancesSeries, Series currentInstanceSeries, string projection, string size, bool invProp) {
       instancesSeries.Points.Clear();
       currentInstanceSeries.Points.Clear();
 
+      double maxSize = 0, minSize = 0;
+      if (!string.IsNullOrEmpty(size)) {
+        var sizes = Content.ProblemInstances.Where(x => x.Results.ContainsKey(size)).Select(x => x.Results[size]).OfType<Data.DoubleValue>().Where(x => !double.IsNaN(x.Value)).ToList();
+        if (sizes.Count > 0) {
+          maxSize = sizes.Max(x => x.Value);
+          minSize = sizes.Min(x => x.Value);
+        }
+      }
       foreach (var run in Content.ProblemInstances) {
         var xKey = "Projection." + projection + ".X";
@@ -85 +141 @@
         var y = ((Data.DoubleValue)run.Results[yKey]).Value;
         var dataPoint = new DataPoint(x, y) {
-          Label = run.Name
+          Label = run.Name,
         };
-        instancesSeries.Points.Add(dataPoint);
-      }
+        IItem item;
+        if (maxSize > minSize && run.Results.TryGetValue(size, out item)) {
+          var dItem = item as Data.DoubleValue;
+          if (dItem != null) {
+            if (double.IsNaN(dItem.Value))
+              dataPoint.MarkerSize = 1;
+            else {
+              if (invProp) dataPoint.MarkerSize = (int)Math.Round(5 + 15 * (maxSize - dItem.Value) / (maxSize - minSize));
+              else dataPoint.MarkerSize = (int)Math.Round(5 + 15 * (dItem.Value - minSize) / (maxSize - minSize));
+            }
+          }
+        } else if (maxSize == minSize) {
+          dataPoint.MarkerSize = instancesSeries.MarkerSize;
+        } else dataPoint.MarkerSize = 1;
 
-      var curPoint = Content.ProjectCurrentInstance(projection);
-      if (curPoint != null) {
-        var dp = new DataPoint(curPoint.Item1, curPoint.Item2) {
-          Label = Content.Problem.Problem.Name
-        };
-        currentInstanceSeries.Points.Add(dp);
+        if (Content.IsCurrentInstance(run)) currentInstanceSeries.Points.Add(dataPoint);
+        else instancesSeries.Points.Add(dataPoint);
       }
     }
 
+    #region Control Event Handlers
     private void ProjectionComboBoxOnSelectedIndexChanged(object sender, EventArgs e) {
-      if (InvokeRequired) { Invoke((Action<object, EventArgs>)ProjectionComboBoxOnSelectedIndexChanged, sender, e); return; }
-      if (projectionComboBox.SelectedIndex < 0) return;
-      var projection = (string)projectionComboBox.SelectedItem;
-      var instancesSeries = instanceMapChart.Series["InstancesSeries"];
-      var currentInstanceSeries = instanceMapChart.Series["CurrentInstanceSeries"];
-
-      ProjectProblemInstances(instancesSeries, currentInstanceSeries, projection);
+      UpdateProjection();
     }
 
-    private void UpdateProjectionComboBox() {
-      projectionComboBox.Items.Clear();
-      foreach (var str in GetProjections()) {
-        projectionComboBox.Items.Add(str);
-      }
-      if (projectionComboBox.Items.Count > 0)
-        projectionComboBox.SelectedIndex = 0;
+    private void SizeComboBoxOnSelectedIndexChanged(object sender, EventArgs e) {
+      UpdateProjection();
     }
+
+    private void InvPropCheckBoxOnCheckedChanged(object sender, EventArgs e) {
+      UpdateProjection();
+    }
+    #endregion
   }
 }