Changeset 7615 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment.Views

Timestamp:

03/15/12 09:11:17 (12 years ago)

Author:

gkronber

Message:

#1081 merged r7462:7609 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment.Views (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.cs (modified) (4 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj

@@ -102 +102 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -209 +215 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj">
+      <Project>{BF1E4DF4-A4CC-451F-9D50-303F405E265E}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
+      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Name>HeuristicLab.Problems.Instances-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.QuadraticAssignment\3.3\HeuristicLab.Problems.QuadraticAssignment-3.3.csproj">
       <Project>{79271BC8-4446-40E2-BB89-9BE4E17174FE}</Project>

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/Plugin.cs.frame

@@ -34 +34 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
   [PluginDependency("HeuristicLab.Problems.QuadraticAssignment", "3.3")]
   public class HeuristicLabProblemsQuadraticAssignmentViewsPlugin : PluginBase {

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.importInstanceButton = new System.Windows.Forms.Button();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-      this.QAPLIBInstancesLabel = new System.Windows.Forms.Label();
-      this.instancesComboBox = new System.Windows.Forms.ComboBox();
-      this.loadInstanceButton = new System.Windows.Forms.Button();
       this.tabControl = new System.Windows.Forms.TabControl();
       this.problemTabPage = new System.Windows.Forms.TabPage();
@@ -68 +64 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Location = new System.Drawing.Point(105, 29);
-      this.nameTextBox.Size = new System.Drawing.Size(517, 20);
+      this.nameTextBox.Location = new System.Drawing.Point(50, 29);
+      this.nameTextBox.Size = new System.Drawing.Size(572, 20);
       // 
       // nameLabel
@@ -79 +75 @@
       this.infoLabel.Location = new System.Drawing.Point(628, 32);
       // 
-      // importInstanceButton
-      // 
-      this.importInstanceButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.importInstanceButton.Location = new System.Drawing.Point(548, 0);
-      this.importInstanceButton.Name = "importInstanceButton";
-      this.importInstanceButton.Size = new System.Drawing.Size(99, 23);
-      this.importInstanceButton.TabIndex = 5;
-      this.importInstanceButton.Text = "Import...";
-      this.importInstanceButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
-      this.toolTip.SetToolTip(this.importInstanceButton, "Import files in QAPLIB format.");
-      this.importInstanceButton.UseVisualStyleBackColor = true;
-      this.importInstanceButton.Click += new System.EventHandler(this.importInstanceButton_Click);
-      // 
       // openFileDialog
       // 
@@ -97 +80 @@
       this.openFileDialog.Filter = "Dat files|*.dat|All files|*.*";
       // 
-      // QAPLIBInstancesLabel
-      // 
-      this.QAPLIBInstancesLabel.AutoSize = true;
-      this.QAPLIBInstancesLabel.Cursor = System.Windows.Forms.Cursors.Hand;
-      this.QAPLIBInstancesLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.QAPLIBInstancesLabel.ForeColor = System.Drawing.Color.Blue;
-      this.QAPLIBInstancesLabel.Location = new System.Drawing.Point(3, 5);
-      this.QAPLIBInstancesLabel.Name = "QAPLIBInstancesLabel";
-      this.QAPLIBInstancesLabel.Size = new System.Drawing.Size(96, 13);
-      this.QAPLIBInstancesLabel.TabIndex = 6;
-      this.QAPLIBInstancesLabel.Text = "QAPLIB instances:";
-      this.toolTip.SetToolTip(this.QAPLIBInstancesLabel, "These instances were taken from the QAPLIB homepage at http://www.seas.upenn.edu/" +
-              "qaplib/");
-      this.QAPLIBInstancesLabel.Click += new System.EventHandler(this.QAPLIBInstancesLabel_Click);
-      this.QAPLIBInstancesLabel.MouseEnter += new System.EventHandler(this.QAPLIBInstancesLabel_MouseEnter);
-      this.QAPLIBInstancesLabel.MouseLeave += new System.EventHandler(this.QAPLIBInstancesLabel_MouseLeave);
-      // 
-      // instancesComboBox
-      // 
-      this.instancesComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.instancesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.instancesComboBox.FormattingEnabled = true;
-      this.instancesComboBox.Location = new System.Drawing.Point(105, 2);
-      this.instancesComboBox.Name = "instancesComboBox";
-      this.instancesComboBox.Size = new System.Drawing.Size(358, 21);
-      this.instancesComboBox.TabIndex = 7;
-      this.instancesComboBox.SelectedValueChanged += new System.EventHandler(this.instancesComboBox_SelectedValueChanged);
-      // 
-      // loadInstanceButton
-      // 
-      this.loadInstanceButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.loadInstanceButton.Location = new System.Drawing.Point(469, 0);
-      this.loadInstanceButton.Name = "loadInstanceButton";
-      this.loadInstanceButton.Size = new System.Drawing.Size(73, 23);
-      this.loadInstanceButton.TabIndex = 5;
-      this.loadInstanceButton.Text = "Load";
-      this.loadInstanceButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
-      this.toolTip.SetToolTip(this.loadInstanceButton, "Load the selected QAPLIB instance.");
-      this.loadInstanceButton.UseVisualStyleBackColor = true;
-      this.loadInstanceButton.Click += new System.EventHandler(this.loadInstanceButton_Click);
-      // 
       // tabControl
       // 
-      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.problemTabPage);
       this.tabControl.Controls.Add(this.visualizationTabPage);
@@ -188 +129 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.instancesComboBox);
       this.Controls.Add(this.tabControl);
-      this.Controls.Add(this.importInstanceButton);
-      this.Controls.Add(this.loadInstanceButton);
-      this.Controls.Add(this.QAPLIBInstancesLabel);
       this.Name = "QuadraticAssignmentProblemView";
       this.Size = new System.Drawing.Size(647, 492);
-      this.Controls.SetChildIndex(this.QAPLIBInstancesLabel, 0);
-      this.Controls.SetChildIndex(this.loadInstanceButton, 0);
-      this.Controls.SetChildIndex(this.importInstanceButton, 0);
       this.Controls.SetChildIndex(this.tabControl, 0);
-      this.Controls.SetChildIndex(this.instancesComboBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
       this.Controls.SetChildIndex(this.parameterCollectionView, 0);
@@ -214 +147 @@
     #endregion
 
-    private System.Windows.Forms.Button importInstanceButton;
     private System.Windows.Forms.OpenFileDialog openFileDialog;
-    private System.Windows.Forms.Label QAPLIBInstancesLabel;
-    private System.Windows.Forms.ComboBox instancesComboBox;
-    private System.Windows.Forms.Button loadInstanceButton;
     private System.Windows.Forms.TabControl tabControl;
     private System.Windows.Forms.TabPage problemTabPage;

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.cs

@@ -21 +21 @@
 
 using System;
-using System.Drawing;
-using System.IO;
 using System.Windows.Forms;
-using HeuristicLab.Common.Resources;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Optimization.Views;
 
 namespace HeuristicLab.Problems.QuadraticAssignment.Views {
   [View("Quadratic Assignment Problem View")]
   [Content(typeof(QuadraticAssignmentProblem), IsDefaultView = true)]
-  public sealed partial class QuadraticAssignmentProblemView : ParameterizedNamedItemView {
+  public sealed partial class QuadraticAssignmentProblemView : HeuristicOptimizationProblemView {
     public new QuadraticAssignmentProblem Content {
       get { return (QuadraticAssignmentProblem)base.Content; }
@@ -40 +37 @@
     public QuadraticAssignmentProblemView() {
       InitializeComponent();
-      importInstanceButton.Image = VSImageLibrary.Open;
       Controls.Remove(parameterCollectionView);
       parameterCollectionView.Dock = DockStyle.Fill;
@@ -74 +70 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      instancesComboBox.Items.Clear();
       if (Content != null) {
-        foreach (string instance in Content.Instances) {
-          instancesComboBox.Items.Add(instance);
-        }
         qapView.Distances = Content.Distances;
         qapView.Weights = Content.Weights;
@@ -91 +83 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      instancesComboBox.Enabled = !ReadOnly && !Locked && Content != null;
-      loadInstanceButton.Enabled = !ReadOnly && !Locked && Content != null && instancesComboBox.SelectedItem != null;
-      importInstanceButton.Enabled = !ReadOnly && !Locked && Content != null;
-    }
-
-    private void instancesComboBox_SelectedValueChanged(object sender, System.EventArgs e) {
-      loadInstanceButton.Enabled = instancesComboBox.SelectedItem != null;
-    }
-
-    private void loadInstanceButton_Click(object sender, System.EventArgs e) {
-      string instance = instancesComboBox.SelectedItem as string;
-      try {
-        Content.LoadInstanceFromEmbeddedResource(instance);
-      } catch (Exception ex) {
-        PluginInfrastructure.ErrorHandling.ShowErrorDialog(ex);
-      }
-    }
-
-    private void importInstanceButton_Click(object sender, System.EventArgs e) {
-      if (openFileDialog.ShowDialog() == DialogResult.OK) {
-        try {
-          string datFile = openFileDialog.FileName;
-          string directory = Path.GetDirectoryName(datFile);
-          string solFile = Path.Combine(directory, Path.GetFileNameWithoutExtension(datFile) + ".sln");
-          if (File.Exists(solFile)) {
-            Content.LoadInstanceFromFile(datFile, solFile);
-          } else {
-            Content.LoadInstanceFromFile(datFile);
-          }
-        } catch (Exception ex) {
-          PluginInfrastructure.ErrorHandling.ShowErrorDialog(ex);
-        }
-      }
-    }
-
-    private void QAPLIBInstancesLabel_Click(object sender, System.EventArgs e) {
-      System.Diagnostics.Process.Start("http://www.seas.upenn.edu/qaplib/");
-    }
-
-    private void QAPLIBInstancesLabel_MouseEnter(object sender, EventArgs e) {
-      Cursor = Cursors.Hand;
-      QAPLIBInstancesLabel.ForeColor = Color.Red;
-      toolTip.SetToolTip(QAPLIBInstancesLabel, "Browse to http://www.seas.upenn.edu/qaplib/");
-    }
-
-    private void QAPLIBInstancesLabel_MouseLeave(object sender, EventArgs e) {
-      Cursor = Cursors.Default;
-      QAPLIBInstancesLabel.ForeColor = Color.Blue;
-      toolTip.SetToolTip(QAPLIBInstancesLabel, String.Empty);
     }
   }