Changeset 7669 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

Timestamp:

03/28/12 15:47:26 (12 years ago)

Author:

spimming

Message:

#1680: merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.QuadraticAssignment (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (10 diffs)

branches/HeuristicLab.Hive.Azure

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Linq;
-using System.Reflection;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -34 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.QuadraticAssignment {
@@ -39 +38 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class QuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IQAPEvaluator, IPermutationCreator>, IStorableContent {
-    private static string InstancePrefix = "HeuristicLab.Problems.QuadraticAssignment.Data.";
-
+  public sealed class QuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IQAPEvaluator, IPermutationCreator>, IStorableContent,
+    IProblemInstanceConsumer<QAPData>,
+    IProblemInstanceConsumer<TSPData> {
     public string Filename { get; set; }
 
@@ -92 +91 @@
       get { return Operators.OfType<QAPPopulationDiversityAnalyzer>().FirstOrDefault(); }
     }
-
-    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
 
@@ -109 +97 @@
     private QuadraticAssignmentProblem(QuadraticAssignmentProblem original, Cloner cloner)
       : base(original, cloner) {
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
     public QuadraticAssignmentProblem()
@@ -142 +130 @@
 
       InitializeOperators();
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
 
@@ -165 +153 @@
         Parameters.Add(new ValueParameter<DoubleMatrix>("Distances", "The distance matrix which can either be specified directly without the coordinates, or can be calculated automatically from the coordinates.", d));
       }
-      AttachEventHandlers();
+      RegisterEventHandlers();
       #endregion
     }
@@ -254 +242 @@
 
     #region Helpers
-    private void AttachEventHandlers() {
+    private void RegisterEventHandlers() {
       SolutionCreator.PermutationParameter.ActualNameChanged += new EventHandler(SolutionCreator_PermutationParameter_ActualNameChanged);
       Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -266 +254 @@
 
     private void InitializeOperators() {
-      Operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
+      var defaultOperators = new HashSet<IPermutationOperator>(new IPermutationOperator[] {
+        new PartiallyMatchedCrossover(),
+        new Swap2Manipulator(),
+        new ExhaustiveSwap2MoveGenerator()
+      });
+      Operators.AddRange(defaultOperators);
+      Operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>().Except(defaultOperators, new TypeEqualityComparer<IPermutationOperator>()));
       Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IQAPMoveEvaluator>());
@@ -365 +359 @@
     #endregion
 
-    public void LoadInstanceFromFile(string filename) {
-      QAPLIBParser parser = new QAPLIBParser();
-      parser.Parse(filename);
-      if (parser.Error != null) throw parser.Error;
-      Distances = new DoubleMatrix(parser.Distances);
-      Weights = new DoubleMatrix(parser.Weights);
-      Name = "Quadratic Assignment Problem (imported from " + Path.GetFileNameWithoutExtension(filename) + ")";
-      Description = "Imported problem data using QAPLIBParser " + Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).Cast<AssemblyFileVersionAttribute>().FirstOrDefault().Version + ".";
+    public void Load(QAPData data) {
+      var weights = new DoubleMatrix(data.Weights);
+      var distances = new DoubleMatrix(data.Distances);
+      Name = data.Name;
+      Description = data.Description;
+      Load(weights, distances);
+      EvaluateAndLoadAssignment(data.BestKnownAssignment);
+      OnReset();
+    }
+
+    public void Load(TSPData data) {
+      if (data.Dimension > 1000)
+        throw new System.IO.InvalidDataException("Instances with more than 1000 customers are not supported by the QAP.");
+      var weights = new DoubleMatrix(data.Dimension, data.Dimension);
+      for (int i = 0; i < data.Dimension; i++)
+        weights[i, (i + 1) % data.Dimension] = 1;
+      var distances = new DoubleMatrix(data.GetDistanceMatrix());
+      Name = data.Name;
+      Description = data.Description;
+      Load(weights, distances);
+      EvaluateAndLoadAssignment(data.BestKnownTour);
+      OnReset();
+    }
+
+    public void Load(DoubleMatrix weights, DoubleMatrix distances) {
+      if (weights == null || weights.Rows == 0)
+        throw new System.IO.InvalidDataException("The given instance does not contain weights!");
+      if (weights.Rows != weights.Columns)
+        throw new System.IO.InvalidDataException("The weights matrix is not a square matrix!");
+      if (distances == null || distances.Rows == 0)
+        throw new System.IO.InvalidDataException("The given instance does not contain distances!");
+      if (distances.Rows != distances.Columns)
+        throw new System.IO.InvalidDataException("The distances matrix is not a square matrix!");
+      if (weights.Rows != distances.Columns)
+        throw new System.IO.InvalidDataException("The weights matrix and the distance matrix are not of equal size!");
+
+      Weights = weights;
+      Distances = distances;
+
       BestKnownQuality = null;
       BestKnownSolution = null;
       BestKnownSolutions = null;
-      OnReset();
-    }
-
-    public void LoadInstanceFromFile(string datFilename, string slnFilename) {
-      QAPLIBParser datParser = new QAPLIBParser();
-      datParser.Parse(datFilename);
-      if (datParser.Error != null) throw datParser.Error;
-      Distances = new DoubleMatrix(datParser.Distances);
-      Weights = new DoubleMatrix(datParser.Weights);
-      Name = "Quadratic Assignment Problem (imported from " + Path.GetFileNameWithoutExtension(datFilename) + ")";
-      Description = "Imported problem data using QAPLIBParser " + Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).Cast<AssemblyFileVersionAttribute>().FirstOrDefault().Version + ".";
-
-      QAPLIBSolutionParser slnParser = new QAPLIBSolutionParser();
-      slnParser.Parse(slnFilename, 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
-        slnParser.Reset();
-        slnParser.Parse(slnFilename, 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();
-    }
-
-    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());
-              }
-            }
-          }
-        } else {  // no solution exists
-          BestKnownSolution = null;
-          BestKnownSolutions = new ItemSet<Permutation>(new PermutationEqualityComparer());
-          BestKnownQuality = null;
-        }
-      }
-      OnReset();
+    }
+
+    public void EvaluateAndLoadAssignment(int[] assignment) {
+      if (assignment == null || assignment.Length == 0) return;
+      var vector = new Permutation(PermutationTypes.Absolute, assignment);
+      var result = QAPEvaluator.Apply(vector, Weights, Distances);
+      BestKnownQuality = new DoubleValue(result);
+      BestKnownSolution = vector;
+      BestKnownSolutions = new ItemSet<Permutation>();
+      BestKnownSolutions.Add((Permutation)vector.Clone());
     }
   }

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user