Changeset 7558 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

03/06/12 01:43:06 (12 years ago)

Author:

abeham

Message:

#1782: trunk integration of problem instance development

• Adapted TSP and QAP to use the new feature
• Moved the TSPLIB importer dialog from the TSP plugin to the TSPLIB instances plugin (created a view for that provider)
• Created it as a default view for IHeuristicOptimizationProblem in order not to interfere with other problems do not yet work with this

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• HeuristicLab.Optimization.Views-3.3.csproj (modified) (4 diffs)
• HeuristicOptimizationProblemView.Designer.cs (added)
• HeuristicOptimizationProblemView.cs (added)
• Plugin.cs.frame (modified) (1 diff)
• ProblemInstanceProviderView.Designer.cs (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/ProblemInstanceProviderView.Designer.cs) (5 diffs)
• ProblemInstanceProviderView.cs (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/ProblemInstanceProviderView.cs) (4 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -99 +99 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -137 +138 @@
     </Compile>
     <Compile Include="Plugin.cs" />
+    <Compile Include="ProblemInstanceProviderView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ProblemInstanceProviderView.Designer.cs">
+      <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ProblemView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ProblemView.designer.cs">
+      <DependentUpon>ProblemView.cs</DependentUpon>
+    </Compile>
     <Compile Include="RunCollectionModifierListView.cs">
       <SubType>UserControl</SubType>
@@ -251 +264 @@
       <DependentUpon>EngineAlgorithmView.cs</DependentUpon>
     </Compile>
-    <Compile Include="ProblemView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ProblemView.Designer.cs">
-      <DependentUpon>ProblemView.cs</DependentUpon>
+    <Compile Include="HeuristicOptimizationProblemView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="HeuristicOptimizationProblemView.Designer.cs">
+      <DependentUpon>HeuristicOptimizationProblemView.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -335 +348 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
       <Private>False</Private>
+    </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.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">

trunk/sources/HeuristicLab.Optimization.Views/3.3/Plugin.cs.frame

@@ -38 +38 @@
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions","3.3")]
   public class HeuristicLabOptimizationViewsPlugin : PluginBase {

trunk/sources/HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views {
+namespace HeuristicLab.Optimization.Views {
   partial class ProblemInstanceProviderView<T> {
     /// <summary> 
@@ -47 +47 @@
       this.components = new System.ComponentModel.Container();
       this.loadButton = new System.Windows.Forms.Button();
-      this.label2 = new System.Windows.Forms.Label();
+      this.instanceLabel = new System.Windows.Forms.Label();
       this.instancesComboBox = new System.Windows.Forms.ComboBox();
       this.importButton = new System.Windows.Forms.Button();
@@ -65 +65 @@
       this.loadButton.Click += new System.EventHandler(this.loadButton_Click);
       // 
-      // label2
+      // instanceLabel
       // 
-      this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(-3, 3);
-      this.label2.Name = "label2";
-      this.label2.Size = new System.Drawing.Size(51, 13);
-      this.label2.TabIndex = 4;
-      this.label2.Text = "Instance:";
+      this.instanceLabel.AutoSize = true;
+      this.instanceLabel.Location = new System.Drawing.Point(-3, 3);
+      this.instanceLabel.Name = "instanceLabel";
+      this.instanceLabel.Size = new System.Drawing.Size(51, 13);
+      this.instanceLabel.TabIndex = 4;
+      this.instanceLabel.Text = "Instance:";
       // 
       // instancesComboBox
@@ -109 +109 @@
       this.Controls.Add(this.importButton);
       this.Controls.Add(this.loadButton);
-      this.Controls.Add(this.label2);
+      this.Controls.Add(this.instanceLabel);
       this.Name = "ProblemInstanceProviderView";
       this.Size = new System.Drawing.Size(610, 21);
@@ -119 +119 @@
     #endregion
 
-    private System.Windows.Forms.Button loadButton;
-    private System.Windows.Forms.Label label2;
-    private System.Windows.Forms.ComboBox instancesComboBox;
-    private System.Windows.Forms.Button importButton;
     private System.Windows.Forms.OpenFileDialog openFileDialog;
     private System.Windows.Forms.ToolTip toolTip;
+    protected System.Windows.Forms.Button loadButton;
+    protected System.Windows.Forms.Label instanceLabel;
+    protected System.Windows.Forms.ComboBox instancesComboBox;
+    protected System.Windows.Forms.Button importButton;
 
   }

trunk/sources/HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.cs

@@ -29 +29 @@
 using HeuristicLab.Problems.Instances;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views {
+namespace HeuristicLab.Optimization.Views {
   [View("ProblemInstanceProviderView")]
   [Content(typeof(IProblemInstanceProvider<>), IsDefaultView = true)]
@@ -65 +65 @@
     }
 
-    private void loadButton_Click(object sender, EventArgs e) {
+    protected virtual void loadButton_Click(object sender, EventArgs e) {
       var descriptor = (IDataDescriptor)instancesComboBox.SelectedItem;
       var instance = Content.LoadData(descriptor);
@@ -75 +75 @@
     }
 
-    private void importButton_Click(object sender, EventArgs e) {
+    protected virtual void importButton_Click(object sender, EventArgs e) {
       openFileDialog.FileName = GetProblemType() + " instance";
       if (openFileDialog.ShowDialog() == DialogResult.OK) {
@@ -99 +99 @@
     }
 
-    private string GetProblemType() {
+    protected virtual string GetProblemType() {
       string dataTypeName = typeof(T).Name.Split(new char[] { '.' }, StringSplitOptions.RemoveEmptyEntries).Last();
       if (dataTypeName.EndsWith("Data"))