Changeset 7538 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment

Timestamp:

03/01/12 15:15:22 (13 years ago)

Author:

abeham

Message:

#1614

• Fixed plugin dependencies
• Updated GQAP view
• Changed instances infrastructure
  • Changed interface types into classes
  • Removed the library specific instance classes

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

Files:

• GeneralizedQuadraticAssignmentProblem.cs (modified) (6 diffs)
• Plugin.cs.frame (modified) (2 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

@@ -39 +39 @@
   [StorableClass]
   public sealed class GeneralizedQuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IGQAPEvaluator, IGQAPSolutionCreator>, IStorableContent,
-    IProblemInstanceConsumer<IQAPInstance>,
-    IProblemInstanceConsumer<ICTAPInstance>,
-    IProblemInstanceConsumer<ITSPInstance>,
-    IProblemInstanceConsumer<IATSPInstance>,
-    IProblemInstanceConsumer<IGQAPInstance> {
+    IConsumable<QAPInstance>,
+    IConsumable<CTAPInstance>,
+    IConsumable<TSPInstance>,
+    IConsumable<ATSPInstance>,
+    IConsumable<GQAPInstance> {
 
     public override Image ItemImage {
@@ -214 +214 @@
 
     #region Problem Instance Consumptions
-    public bool LoadFrom(IQAPInstance instance) {
+    public bool LoadFrom(QAPInstance instance) {
       try {
         Name = instance.Name;
@@ -240 +240 @@
     }
 
-    public bool LoadFrom(ICTAPInstance instance) {
+    public bool LoadFrom(CTAPInstance instance) {
       try {
         Name = instance.Name;
@@ -270 +270 @@
     }
 
-    public bool LoadFrom(ITSPInstance instance) {
+    public bool LoadFrom(TSPInstance instance) {
       try {
         if (instance.Dimension > 1000) return false;
@@ -304 +304 @@
     }
 
-    public bool LoadFrom(IATSPInstance instance) {
+    public bool LoadFrom(ATSPInstance instance) {
       try {
         Name = instance.Name;
@@ -336 +336 @@
     }
 
-    public bool LoadFrom(IGQAPInstance instance) {
+    public bool LoadFrom(GQAPInstance instance) {
       try {
         Name = instance.Name;

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Plugin.cs.frame

@@ -25 +25 @@
   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment", "3.3.6.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
@@ -33 +34 @@
   [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   [PluginDependency("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   public class HeuristicLabProblemsGeneralizedQuadraticAssignmentPlugin : PluginBase {
   }