Changeset 6952

Timestamp:

11/06/11 20:47:56 (13 years ago)

Author:

abeham

Message:

#1619

• reverted changes to trunk
• readded instances as embedded resources

Location:

trunk/sources

Files:

• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.cs (modified) (6 diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/Data (copied) (copied from trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Data) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/Service References (deleted)
• HeuristicLab.Problems.QuadraticAssignment/3.3/app.config (deleted)

trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj

@@ -212 +212 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.Designer.cs

@@ -54 +54 @@
       this.visualizationTabPage = new System.Windows.Forms.TabPage();
       this.qapView = new HeuristicLab.Problems.QuadraticAssignment.Views.QAPVisualizationControl();
-      this.reloadInstancesButton = new System.Windows.Forms.Button();
-      this.loadInstanceWorker = new System.ComponentModel.BackgroundWorker();
-      this.progressBar = new System.Windows.Forms.ProgressBar();
-      this.getInstancesWorker = new System.ComponentModel.BackgroundWorker();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -94 +90 @@
       this.toolTip.SetToolTip(this.importInstanceButton, "Import files in QAPLIB format.");
       this.importInstanceButton.UseVisualStyleBackColor = true;
-      this.importInstanceButton.Click += new System.EventHandler(this.importFileInstanceButton_Click);
+      this.importInstanceButton.Click += new System.EventHandler(this.importInstanceButton_Click);
       // 
       // openFileDialog
@@ -124 +120 @@
       this.instancesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.instancesComboBox.FormattingEnabled = true;
-      this.instancesComboBox.Location = new System.Drawing.Point(137, 1);
+      this.instancesComboBox.Location = new System.Drawing.Point(105, 2);
       this.instancesComboBox.Name = "instancesComboBox";
-      this.instancesComboBox.Size = new System.Drawing.Size(326, 21);
+      this.instancesComboBox.Size = new System.Drawing.Size(358, 21);
       this.instancesComboBox.TabIndex = 7;
       this.instancesComboBox.SelectedValueChanged += new System.EventHandler(this.instancesComboBox_SelectedValueChanged);
@@ -188 +184 @@
       this.qapView.Weights = null;
       // 
-      // reloadInstancesButton
-      // 
-      this.reloadInstancesButton.Location = new System.Drawing.Point(105, 0);
-      this.reloadInstancesButton.Name = "reloadInstancesButton";
-      this.reloadInstancesButton.Size = new System.Drawing.Size(26, 23);
-      this.reloadInstancesButton.TabIndex = 9;
-      this.reloadInstancesButton.Text = "Reload";
-      this.reloadInstancesButton.UseVisualStyleBackColor = true;
-      this.reloadInstancesButton.Click += new System.EventHandler(this.reloadInstancesButton_Click);
-      // 
-      // loadInstanceWorker
-      // 
-      this.loadInstanceWorker.WorkerReportsProgress = true;
-      this.loadInstanceWorker.DoWork += new System.ComponentModel.DoWorkEventHandler(this.loadInstanceWorker_DoWork);
-      this.loadInstanceWorker.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.worker_ProgressChanged);
-      this.loadInstanceWorker.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.worker_RunWorkerCompleted);
-      // 
-      // progressBar
-      // 
-      this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.progressBar.Location = new System.Drawing.Point(137, 0);
-      this.progressBar.Name = "progressBar";
-      this.progressBar.Size = new System.Drawing.Size(326, 23);
-      this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
-      this.progressBar.TabIndex = 10;
-      this.progressBar.Visible = false;
-      // 
-      // getInstancesWorker
-      // 
-      this.getInstancesWorker.WorkerReportsProgress = true;
-      this.getInstancesWorker.DoWork += new System.ComponentModel.DoWorkEventHandler(this.getInstancesWorker_DoWork);
-      this.getInstancesWorker.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.worker_ProgressChanged);
-      this.getInstancesWorker.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.worker_RunWorkerCompleted);
-      // 
       // QuadraticAssignmentProblemView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.progressBar);
       this.Controls.Add(this.instancesComboBox);
       this.Controls.Add(this.tabControl);
       this.Controls.Add(this.importInstanceButton);
       this.Controls.Add(this.loadInstanceButton);
-      this.Controls.Add(this.reloadInstancesButton);
       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.reloadInstancesButton, 0);
       this.Controls.SetChildIndex(this.loadInstanceButton, 0);
       this.Controls.SetChildIndex(this.importInstanceButton, 0);
@@ -246 +204 @@
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
-      this.Controls.SetChildIndex(this.progressBar, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.tabControl.ResumeLayout(false);
@@ -266 +223 @@
     private System.Windows.Forms.TabPage visualizationTabPage;
     private QAPVisualizationControl qapView;
-    private System.Windows.Forms.Button reloadInstancesButton;
-    private System.ComponentModel.BackgroundWorker loadInstanceWorker;
-    private System.Windows.Forms.ProgressBar progressBar;
-    private System.ComponentModel.BackgroundWorker getInstancesWorker;
   }
 }

trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.cs

@@ -21 +21 @@
 
 using System;
-using System.ComponentModel;
 using System.Drawing;
-using System.Linq;
+using System.IO;
 using System.Windows.Forms;
 using HeuristicLab.Common.Resources;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Problems.QuadraticAssignment.QAPInstanceService;
 
 namespace HeuristicLab.Problems.QuadraticAssignment.Views {
@@ -46 +41 @@
       InitializeComponent();
       importInstanceButton.Image = VSImageLibrary.Open;
-      reloadInstancesButton.Text = String.Empty;
-      reloadInstancesButton.Image = VSImageLibrary.Refresh;
-      loadInstanceButton.Image = VSImageLibrary.Internet;
       Controls.Remove(parameterCollectionView);
       parameterCollectionView.Dock = DockStyle.Fill;
@@ -59 +51 @@
       Content.WeightsParameter.ValueChanged += new EventHandler(WeightsParameter_ValueChanged);
       Content.BestKnownSolutionParameter.ValueChanged += new EventHandler(BestKnownSolutionParameter_ValueChanged);
-      Content.Instances.ItemsAdded += new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
-      Content.Instances.ItemsMoved += new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
-      Content.Instances.ItemsRemoved += new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
-      Content.Instances.ItemsReplaced += new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
-      Content.Instances.CollectionReset += new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
     }
 
@@ -70 +57 @@
       Content.WeightsParameter.ValueChanged -= new EventHandler(WeightsParameter_ValueChanged);
       Content.BestKnownSolutionParameter.ValueChanged -= new EventHandler(BestKnownSolutionParameter_ValueChanged);
-      Content.Instances.ItemsAdded -= new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
-      Content.Instances.ItemsMoved -= new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
-      Content.Instances.ItemsRemoved -= new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
-      Content.Instances.ItemsReplaced -= new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
-      Content.Instances.CollectionReset -= new Collections.CollectionItemsChangedEventHandler<Collections.IndexedItem<string>>(Content_Instances_Changed);
       base.DeregisterContentEvents();
-    }
-
-    private void Content_Instances_Changed(object sender, EventArgs e) {
-      instancesComboBox.Items.Clear();
-      foreach (string name in Content.Instances)
-        instancesComboBox.Items.Add(name);
-      if (instancesComboBox.Items.Count > 0)
-        instancesComboBox.SelectedIndex = 0;
     }
 
@@ -100 +74 @@
     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;
@@ -113 +91 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      reloadInstancesButton.Enabled = !ReadOnly && !Locked && Content != null;
       instancesComboBox.Enabled = !ReadOnly && !Locked && Content != null;
-      loadInstanceButton.Enabled = !ReadOnly && !Locked && Content != null && !String.IsNullOrEmpty((string)instancesComboBox.SelectedItem);
+      loadInstanceButton.Enabled = !ReadOnly && !Locked && Content != null && instancesComboBox.SelectedItem != null;
       importInstanceButton.Enabled = !ReadOnly && !Locked && Content != null;
     }
 
     private void instancesComboBox_SelectedValueChanged(object sender, System.EventArgs e) {
-      SetEnabledStateOfControls();
+      loadInstanceButton.Enabled = instancesComboBox.SelectedItem != null;
     }
 
     private void loadInstanceButton_Click(object sender, System.EventArgs e) {
-      ReadOnly = true;
-      string instanceStr = instancesComboBox.SelectedItem as string;
-      progressBar.Visible = true;
-      loadInstanceWorker.RunWorkerAsync(instanceStr);
+      string instance = instancesComboBox.SelectedItem as string;
+      try {
+        Content.LoadInstanceFromEmbeddedResource(instance);
+      } catch (Exception ex) {
+        PluginInfrastructure.ErrorHandling.ShowErrorDialog(ex);
+      }
     }
 
-    private void importFileInstanceButton_Click(object sender, System.EventArgs e) {
+    private void importInstanceButton_Click(object sender, System.EventArgs e) {
       if (openFileDialog.ShowDialog() == DialogResult.OK) {
         try {
-          Content.LoadInstanceFromFile(openFileDialog.FileName);
+          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 reloadInstancesButton_Click(object sender, EventArgs e) {
-      ReadOnly = true;
-      progressBar.Visible = true;
-      getInstancesWorker.RunWorkerAsync();
-    }
-
-    private void loadInstanceWorker_DoWork(object sender, DoWorkEventArgs e) {
-      string instance = (string)e.Argument;
-      if (String.IsNullOrEmpty(instance)) return;
-      using (var client = new QAPClient()) {
-        loadInstanceWorker.ReportProgress(10);
-        var data = client.GetProblemInstanceData(instance);
-        loadInstanceWorker.ReportProgress(60);
-        DoubleMatrix weights = new DoubleMatrix(data.Weights.Length, data.Weights.Length);
-        DoubleMatrix distances = new DoubleMatrix(data.Weights.Length, data.Weights.Length);
-        try {
-          for (int i = 0; i < data.Weights.Length; i++)
-            for (int j = 0; j < data.Weights.Length; j++) {
-              weights[i, j] = data.Weights[i][j];
-              distances[i, j] = data.Distances[i][j];
-            }
-        } catch (IndexOutOfRangeException) {
-          MessageBox.Show("The problem data is malformed, the problem could not be loaded.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-        loadInstanceWorker.ReportProgress(65);
-        Content.Name = data.Name;
-        Content.Description = data.Description;
-        Content.Maximization.Value = data.Maximization;
-        Content.Weights = weights;
-        Content.Distances = distances;
-
-        Content.BestKnownQualityParameter.Value = null;
-        Content.BestKnownSolution = null;
-        Content.BestKnownSolutions = new ItemSet<Permutation>();
-        var solutions = client.GetBestSolutionsData(instance);
-        loadInstanceWorker.ReportProgress(90);
-        if (solutions.Any()) {
-          Content.BestKnownQualityParameter.Value = new DoubleValue(solutions.First().Quality);
-          Content.BestKnownSolution = new Permutation(PermutationTypes.Absolute, solutions.First().Assignment);
-          foreach (var solution in solutions) {
-            Content.BestKnownSolutions.Add(new Permutation(PermutationTypes.Absolute, solution.Assignment));
-          }
-        }
-        loadInstanceWorker.ReportProgress(100);
-      }
-    }
-
-    private void getInstancesWorker_DoWork(object sender, DoWorkEventArgs e) {
-      using (var client = new QAPClient()) {
-        getInstancesWorker.ReportProgress(10);
-        var instances = client.GetProblemInstances();
-        getInstancesWorker.ReportProgress(85);
-        Content.Instances.Replace(instances);
-        getInstancesWorker.ReportProgress(100);
-      }
-    }
-
-    private void worker_ProgressChanged(object sender, ProgressChangedEventArgs e) {
-      progressBar.Value = e.ProgressPercentage;
-    }
-
-    private void worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
-      progressBar.Visible = false;
-      ReadOnly = false;
-      if (e.Error != null)
-        PluginInfrastructure.ErrorHandling.ShowErrorDialog(e.Error);
     }
 

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

@@ -130 +130 @@
     <Compile Include="QAPPermutationProximityCalculator.cs" />
     <Compile Include="QuadraticAssignmentProblem.cs" />
-    <Compile Include="Service References\QAPInstanceService\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Compile>
-    <None Include="app.config" />
+    <EmbeddedResource Include="Data\bur26a.dat" />
+    <EmbeddedResource Include="Data\bur26b.dat" />
+    <EmbeddedResource Include="Data\bur26c.dat" />
+    <EmbeddedResource Include="Data\bur26d.dat" />
+    <EmbeddedResource Include="Data\bur26e.dat" />
+    <EmbeddedResource Include="Data\bur26f.dat" />
+    <EmbeddedResource Include="Data\bur26g.dat" />
+    <EmbeddedResource Include="Data\bur26h.dat" />
+    <EmbeddedResource Include="Data\chr12a.dat" />
+    <EmbeddedResource Include="Data\chr12b.dat" />
+    <EmbeddedResource Include="Data\chr12c.dat" />
+    <EmbeddedResource Include="Data\chr15a.dat" />
+    <EmbeddedResource Include="Data\chr15b.dat" />
+    <EmbeddedResource Include="Data\chr15c.dat" />
+    <EmbeddedResource Include="Data\chr18a.dat" />
+    <EmbeddedResource Include="Data\chr18b.dat" />
+    <EmbeddedResource Include="Data\chr20a.dat" />
+    <EmbeddedResource Include="Data\chr20b.dat" />
+    <EmbeddedResource Include="Data\chr20c.dat" />
+    <EmbeddedResource Include="Data\chr22a.dat" />
+    <EmbeddedResource Include="Data\chr22b.dat" />
+    <EmbeddedResource Include="Data\chr25a.dat" />
+    <EmbeddedResource Include="Data\els19.dat" />
+    <EmbeddedResource Include="Data\esc128.dat" />
+    <EmbeddedResource Include="Data\esc16a.dat" />
+    <EmbeddedResource Include="Data\esc16b.dat" />
+    <EmbeddedResource Include="Data\esc16c.dat" />
+    <EmbeddedResource Include="Data\esc16d.dat" />
+    <EmbeddedResource Include="Data\esc16e.dat" />
+    <EmbeddedResource Include="Data\esc16f.dat" />
+    <EmbeddedResource Include="Data\esc16g.dat" />
+    <EmbeddedResource Include="Data\esc16h.dat" />
+    <EmbeddedResource Include="Data\esc16i.dat" />
+    <EmbeddedResource Include="Data\esc16j.dat" />
+    <EmbeddedResource Include="Data\esc32a.dat" />
+    <EmbeddedResource Include="Data\esc32b.dat" />
+    <EmbeddedResource Include="Data\esc32c.dat" />
+    <EmbeddedResource Include="Data\esc32d.dat" />
+    <EmbeddedResource Include="Data\esc32e.dat" />
+    <EmbeddedResource Include="Data\esc32f.dat" />
+    <EmbeddedResource Include="Data\esc32g.dat" />
+    <EmbeddedResource Include="Data\esc32h.dat" />
+    <EmbeddedResource Include="Data\esc64a.dat" />
+    <EmbeddedResource Include="Data\had12.dat" />
+    <EmbeddedResource Include="Data\had14.dat" />
+    <EmbeddedResource Include="Data\had16.dat" />
+    <EmbeddedResource Include="Data\had18.dat" />
+    <EmbeddedResource Include="Data\had20.dat" />
+    <EmbeddedResource Include="Data\kra30a.dat" />
+    <EmbeddedResource Include="Data\kra30b.dat" />
+    <EmbeddedResource Include="Data\kra32.dat" />
+    <EmbeddedResource Include="Data\lipa20a.dat" />
+    <EmbeddedResource Include="Data\lipa20b.dat" />
+    <EmbeddedResource Include="Data\lipa30a.dat" />
+    <EmbeddedResource Include="Data\lipa30b.dat" />
+    <EmbeddedResource Include="Data\lipa40a.dat" />
+    <EmbeddedResource Include="Data\lipa40b.dat" />
+    <EmbeddedResource Include="Data\lipa50a.dat" />
+    <EmbeddedResource Include="Data\lipa50b.dat" />
+    <EmbeddedResource Include="Data\lipa60a.dat" />
+    <EmbeddedResource Include="Data\lipa60b.dat" />
+    <EmbeddedResource Include="Data\lipa70a.dat" />
+    <EmbeddedResource Include="Data\lipa70b.dat" />
+    <EmbeddedResource Include="Data\lipa80a.dat" />
+    <EmbeddedResource Include="Data\lipa80b.dat" />
+    <EmbeddedResource Include="Data\lipa90a.dat" />
+    <EmbeddedResource Include="Data\lipa90b.dat" />
+    <EmbeddedResource Include="Data\nug12.dat" />
+    <EmbeddedResource Include="Data\nug14.dat" />
+    <EmbeddedResource Include="Data\nug15.dat" />
+    <EmbeddedResource Include="Data\nug16a.dat" />
+    <EmbeddedResource Include="Data\nug16b.dat" />
+    <EmbeddedResource Include="Data\nug17.dat" />
+    <EmbeddedResource Include="Data\nug18.dat" />
+    <EmbeddedResource Include="Data\nug20.dat" />
+    <EmbeddedResource Include="Data\nug21.dat" />
+    <EmbeddedResource Include="Data\nug22.dat" />
+    <EmbeddedResource Include="Data\nug24.dat" />
+    <EmbeddedResource Include="Data\nug25.dat" />
+    <EmbeddedResource Include="Data\nug27.dat" />
+    <EmbeddedResource Include="Data\nug28.dat" />
+    <EmbeddedResource Include="Data\nug30.dat" />
+    <EmbeddedResource Include="Data\rou12.dat" />
+    <EmbeddedResource Include="Data\rou15.dat" />
+    <EmbeddedResource Include="Data\rou20.dat" />
+    <EmbeddedResource Include="Data\scr12.dat" />
+    <EmbeddedResource Include="Data\scr15.dat" />
+    <EmbeddedResource Include="Data\scr20.dat" />
+    <EmbeddedResource Include="Data\sko100a.dat" />
+    <EmbeddedResource Include="Data\sko100b.dat" />
+    <EmbeddedResource Include="Data\sko100c.dat" />
+    <EmbeddedResource Include="Data\sko100d.dat" />
+    <EmbeddedResource Include="Data\sko100e.dat" />
+    <EmbeddedResource Include="Data\sko100f.dat" />
+    <EmbeddedResource Include="Data\sko42.dat" />
+    <EmbeddedResource Include="Data\sko49.dat" />
+    <EmbeddedResource Include="Data\sko56.dat" />
+    <EmbeddedResource Include="Data\sko64.dat" />
+    <EmbeddedResource Include="Data\sko72.dat" />
+    <EmbeddedResource Include="Data\sko81.dat" />
+    <EmbeddedResource Include="Data\sko90.dat" />
+    <EmbeddedResource Include="Data\ste36a.dat" />
+    <EmbeddedResource Include="Data\ste36b.dat" />
+    <EmbeddedResource Include="Data\ste36c.dat" />
+    <EmbeddedResource Include="Data\tai100a.dat" />
+    <EmbeddedResource Include="Data\tai100b.dat" />
+    <EmbeddedResource Include="Data\tai10a.dat" />
+    <EmbeddedResource Include="Data\tai10b.dat" />
+    <EmbeddedResource Include="Data\tai12a.dat" />
+    <EmbeddedResource Include="Data\tai12b.dat" />
+    <EmbeddedResource Include="Data\tai150b.dat" />
+    <EmbeddedResource Include="Data\tai15a.dat" />
+    <EmbeddedResource Include="Data\tai15b.dat" />
+    <EmbeddedResource Include="Data\tai17a.dat" />
+    <EmbeddedResource Include="Data\tai20a.dat" />
+    <EmbeddedResource Include="Data\tai20b.dat" />
+    <EmbeddedResource Include="Data\tai256c.dat" />
+    <EmbeddedResource Include="Data\tai25a.dat" />
+    <EmbeddedResource Include="Data\tai25b.dat" />
+    <EmbeddedResource Include="Data\tai30a.dat" />
+    <EmbeddedResource Include="Data\tai30b.dat" />
+    <EmbeddedResource Include="Data\tai35a.dat" />
+    <EmbeddedResource Include="Data\tai35b.dat" />
+    <EmbeddedResource Include="Data\tai40a.dat" />
+    <EmbeddedResource Include="Data\tai40b.dat" />
+    <EmbeddedResource Include="Data\tai50a.dat" />
+    <EmbeddedResource Include="Data\tai50b.dat" />
+    <EmbeddedResource Include="Data\tai60a.dat" />
+    <EmbeddedResource Include="Data\tai60b.dat" />
+    <EmbeddedResource Include="Data\tai64c.dat" />
+    <EmbeddedResource Include="Data\tai80a.dat" />
+    <EmbeddedResource Include="Data\tai80b.dat" />
+    <EmbeddedResource Include="Data\tho150.dat" />
+    <EmbeddedResource Include="Data\tho30.dat" />
+    <EmbeddedResource Include="Data\tho40.dat" />
+    <EmbeddedResource Include="Data\wil100.dat" />
+    <EmbeddedResource Include="Data\wil50.dat" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
-    <None Include="Service References\QAPInstanceService\HeuristicLab.Problems.QuadraticAssignment.QAPInstanceService.QAPInstanceDto.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Service References\QAPInstanceService\HeuristicLab.Problems.QuadraticAssignment.QAPInstanceService.QAPSolutionDto.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Service References\QAPInstanceService\QAP.wsdl" />
-    <None Include="Service References\QAPInstanceService\QAP.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Service References\QAPInstanceService\QAP1.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Service References\QAPInstanceService\QAP2.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Service References\QAPInstanceService\QAP3.xsd">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
@@ -226 +338 @@
   </ItemGroup>
   <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadataStorage Include="Service References\QAPInstanceService\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\QAPInstanceService\QAP.disco" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\QAPInstanceService\configuration91.svcinfo" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\QAPInstanceService\configuration.svcinfo" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\QAPInstanceService\Reference.svcmap">
-      <Generator>WCF Proxy Generator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
+    <EmbeddedResource Include="Data\bur26a.sln" />
+    <EmbeddedResource Include="Data\bur26b.sln" />
+    <EmbeddedResource Include="Data\bur26c.sln" />
+    <EmbeddedResource Include="Data\bur26d.sln" />
+    <EmbeddedResource Include="Data\bur26e.sln" />
+    <EmbeddedResource Include="Data\bur26f.sln" />
+    <EmbeddedResource Include="Data\bur26g.sln" />
+    <EmbeddedResource Include="Data\bur26h.sln" />
+    <EmbeddedResource Include="Data\chr12a.sln" />
+    <EmbeddedResource Include="Data\chr12b.sln" />
+    <EmbeddedResource Include="Data\chr12c.sln" />
+    <EmbeddedResource Include="Data\chr15a.sln" />
+    <EmbeddedResource Include="Data\chr15b.sln" />
+    <EmbeddedResource Include="Data\chr15c.sln" />
+    <EmbeddedResource Include="Data\chr18a.sln" />
+    <EmbeddedResource Include="Data\chr18b.sln" />
+    <EmbeddedResource Include="Data\chr20a.sln" />
+    <EmbeddedResource Include="Data\chr20b.sln" />
+    <EmbeddedResource Include="Data\chr20c.sln" />
+    <EmbeddedResource Include="Data\chr22a.sln" />
+    <EmbeddedResource Include="Data\chr22b.sln" />
+    <EmbeddedResource Include="Data\chr25a.sln" />
+    <EmbeddedResource Include="Data\els19.sln" />
+    <EmbeddedResource Include="Data\esc128.sln" />
+    <EmbeddedResource Include="Data\esc16a.sln" />
+    <EmbeddedResource Include="Data\esc16b.sln" />
+    <EmbeddedResource Include="Data\esc16c.sln" />
+    <EmbeddedResource Include="Data\esc16d.sln" />
+    <EmbeddedResource Include="Data\esc16e.sln" />
+    <EmbeddedResource Include="Data\esc16f.sln" />
+    <EmbeddedResource Include="Data\esc16g.sln" />
+    <EmbeddedResource Include="Data\esc16h.sln" />
+    <EmbeddedResource Include="Data\esc16i.sln" />
+    <EmbeddedResource Include="Data\esc16j.sln" />
+    <EmbeddedResource Include="Data\esc32a.sln" />
+    <EmbeddedResource Include="Data\esc32e.sln" />
+    <EmbeddedResource Include="Data\esc32f.sln" />
+    <EmbeddedResource Include="Data\esc32g.sln" />
+    <EmbeddedResource Include="Data\had12.sln" />
+    <EmbeddedResource Include="Data\had14.sln" />
+    <EmbeddedResource Include="Data\had16.sln" />
+    <EmbeddedResource Include="Data\had18.sln" />
+    <EmbeddedResource Include="Data\had20.sln" />
+    <EmbeddedResource Include="Data\kra30a.sln" />
+    <EmbeddedResource Include="Data\kra30b.sln" />
+    <EmbeddedResource Include="Data\kra32.sln" />
+    <EmbeddedResource Include="Data\lipa20a.sln" />
+    <EmbeddedResource Include="Data\lipa20b.sln" />
+    <EmbeddedResource Include="Data\lipa30a.sln" />
+    <EmbeddedResource Include="Data\lipa30b.sln" />
+    <EmbeddedResource Include="Data\lipa40a.sln" />
+    <EmbeddedResource Include="Data\lipa40b.sln" />
+    <EmbeddedResource Include="Data\lipa50a.sln" />
+    <EmbeddedResource Include="Data\lipa50b.sln" />
+    <EmbeddedResource Include="Data\lipa60a.sln" />
+    <EmbeddedResource Include="Data\lipa60b.sln" />
+    <EmbeddedResource Include="Data\lipa70a.sln" />
+    <EmbeddedResource Include="Data\lipa70b.sln" />
+    <EmbeddedResource Include="Data\lipa80a.sln" />
+    <EmbeddedResource Include="Data\lipa80b.sln" />
+    <EmbeddedResource Include="Data\lipa90a.sln" />
+    <EmbeddedResource Include="Data\lipa90b.sln" />
+    <EmbeddedResource Include="Data\nug12.sln" />
+    <EmbeddedResource Include="Data\nug14.sln" />
+    <EmbeddedResource Include="Data\nug15.sln" />
+    <EmbeddedResource Include="Data\nug16a.sln" />
+    <EmbeddedResource Include="Data\nug16b.sln" />
+    <EmbeddedResource Include="Data\nug17.sln" />
+    <EmbeddedResource Include="Data\nug18.sln" />
+    <EmbeddedResource Include="Data\nug20.sln" />
+    <EmbeddedResource Include="Data\nug21.sln" />
+    <EmbeddedResource Include="Data\nug22.sln" />
+    <EmbeddedResource Include="Data\nug24.sln" />
+    <EmbeddedResource Include="Data\nug25.sln" />
+    <EmbeddedResource Include="Data\nug27.sln" />
+    <EmbeddedResource Include="Data\nug28.sln" />
+    <EmbeddedResource Include="Data\nug30.sln" />
+    <EmbeddedResource Include="Data\rou12.sln" />
+    <EmbeddedResource Include="Data\rou15.sln" />
+    <EmbeddedResource Include="Data\rou20.sln" />
+    <EmbeddedResource Include="Data\scr12.sln" />
+    <EmbeddedResource Include="Data\scr15.sln" />
+    <EmbeddedResource Include="Data\scr20.sln" />
+    <EmbeddedResource Include="Data\sko100a.sln" />
+    <EmbeddedResource Include="Data\sko100b.sln" />
+    <EmbeddedResource Include="Data\sko100c.sln" />
+    <EmbeddedResource Include="Data\sko100d.sln" />
+    <EmbeddedResource Include="Data\sko100e.sln" />
+    <EmbeddedResource Include="Data\sko100f.sln" />
+    <EmbeddedResource Include="Data\sko49.sln" />
+    <EmbeddedResource Include="Data\sko81.sln" />
+    <EmbeddedResource Include="Data\sko90.sln" />
+    <EmbeddedResource Include="Data\ste36a.sln" />
+    <EmbeddedResource Include="Data\ste36b.sln" />
+    <EmbeddedResource Include="Data\ste36c.sln" />
+    <EmbeddedResource Include="Data\tai100a.sln" />
+    <EmbeddedResource Include="Data\tai100b.sln" />
+    <EmbeddedResource Include="Data\tai12a.sln" />
+    <EmbeddedResource Include="Data\tai12b.sln" />
+    <EmbeddedResource Include="Data\tai150b.sln" />
+    <EmbeddedResource Include="Data\tai15a.sln" />
+    <EmbeddedResource Include="Data\tai15b.sln" />
+    <EmbeddedResource Include="Data\tai17a.sln" />
+    <EmbeddedResource Include="Data\tai20a.sln" />
+    <EmbeddedResource Include="Data\tai20b.sln" />
+    <EmbeddedResource Include="Data\tai256c.sln" />
+    <EmbeddedResource Include="Data\tai25a.sln" />
+    <EmbeddedResource Include="Data\tai25b.sln" />
+    <EmbeddedResource Include="Data\tai30b.sln" />
+    <EmbeddedResource Include="Data\tai35b.sln" />
+    <EmbeddedResource Include="Data\tai40b.sln" />
+    <EmbeddedResource Include="Data\tai50a.sln" />
+    <EmbeddedResource Include="Data\tai50b.sln" />
+    <EmbeddedResource Include="Data\tai60a.sln" />
+    <EmbeddedResource Include="Data\tai60b.sln" />
+    <EmbeddedResource Include="Data\tai64c.sln" />
+    <EmbeddedResource Include="Data\tai80a.sln" />
+    <EmbeddedResource Include="Data\tai80b.sln" />
+    <EmbeddedResource Include="Data\tho150.sln" />
+    <EmbeddedResource Include="Data\tho30.sln" />
+    <EmbeddedResource Include="Data\wil100.sln" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -93 +93 @@
     }
 
-    private ObservableList<string> instances = new ObservableList<string>();
-    public ObservableList<string> Instances {
-      get { return instances; }
+    public IEnumerable<string> Instances {
+      get {
+        return Assembly.GetExecutingAssembly()
+          .GetManifestResourceNames()
+          .Where(x => x.EndsWith(".dat"))
+          .OrderBy(x => x)
+          .Select(x => x.Replace(".dat", String.Empty))
+          .Select(x => x.Replace(InstancePrefix, String.Empty));
+      }
     }
     #endregion
@@ -103 +109 @@
     private QuadraticAssignmentProblem(QuadraticAssignmentProblem original, Cloner cloner)
       : base(original, cloner) {
-      instances = new ObservableList<string>(original.instances);
       AttachEventHandlers();
     }
@@ -412 +417 @@
       OnReset();
     }
+
+    public void LoadInstanceFromEmbeddedResource(string instance) {
+      using (Stream stream = Assembly.GetExecutingAssembly()
+        .GetManifestResourceStream(InstancePrefix + instance + ".dat")) {
+        QAPLIBParser datParser = new QAPLIBParser();
+        datParser.Parse(stream);
+        if (datParser.Error != null) throw datParser.Error;
+        Distances = new DoubleMatrix(datParser.Distances);
+        Weights = new DoubleMatrix(datParser.Weights);
+        Name = instance;
+        Description = "Loaded embedded instance " + instance + " of plugin version " + Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).Cast<AssemblyFileVersionAttribute>().FirstOrDefault().Version + ".";
+
+        bool solutionExists = Assembly.GetExecutingAssembly()
+          .GetManifestResourceNames()
+          .Where(x => x.EndsWith(instance + ".sln"))
+          .Any();
+
+        if (solutionExists) {
+          using (Stream solStream = Assembly.GetExecutingAssembly()
+            .GetManifestResourceStream(InstancePrefix + instance + ".sln")) {
+            QAPLIBSolutionParser slnParser = new QAPLIBSolutionParser();
+            slnParser.Parse(solStream, true);
+            if (slnParser.Error != null) throw slnParser.Error;
+
+            BestKnownQuality = new DoubleValue(slnParser.Quality);
+            BestKnownSolution = new Permutation(PermutationTypes.Absolute, slnParser.Assignment);
+            BestKnownSolutions = new ItemSet<Permutation>(new PermutationEqualityComparer());
+            BestKnownSolutions.Add((Permutation)BestKnownSolution.Clone());
+
+            if (!BestKnownQuality.Value.IsAlmost(QAPEvaluator.Apply(BestKnownSolution, Weights, Distances))) {
+              // the solution doesn't result in the given quality, maybe indices and values are inverted
+              // try parsing again, this time inverting them
+              solStream.Seek(0, SeekOrigin.Begin);
+              slnParser.Reset();
+              slnParser.Parse(solStream, false);
+              if (slnParser.Error != null) throw slnParser.Error;
+
+              BestKnownQuality = new DoubleValue(slnParser.Quality);
+              BestKnownSolution = new Permutation(PermutationTypes.Absolute, slnParser.Assignment);
+              BestKnownSolutions = new ItemSet<Permutation>(new PermutationEqualityComparer());
+              BestKnownSolutions.Add((Permutation)BestKnownSolution.Clone());
+
+              if (!BestKnownQuality.Value.IsAlmost(QAPEvaluator.Apply(BestKnownSolution, Weights, Distances))) {
+                // if the solution still doesn't result in the given quality, remove it and only take the quality
+                BestKnownSolution = null;
+                BestKnownSolutions = new ItemSet<Permutation>(new PermutationEqualityComparer());
+              }
+            }
+          }
+        }
+      }
+      OnReset();
+    }
   }
 }