Changeset 7480

Timestamp:

02/17/12 14:03:43 (12 years ago)

Author:

abeham

Message:

#1614

• Fixed a parameter type in the GQAP
• Fixed loading of ICTAP instances (only the upper triangular matrix is required for the distances)
• Fixed a bug in the reducer that causes the loss of diversity

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

Files:

• GeneralizedQuadraticAssignmentProblem.cs (modified) (2 diffs)
• Operators/GQAPQualitySimilarityReducer.cs (modified) (1 diff)

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

@@ -167 +167 @@
       Parameters.Add(new ValueParameter<DoubleArray>("Demands", DemandsDescription, new DoubleArray(), false));
       Parameters.Add(new ValueParameter<DoubleArray>("Capacities", CapacitiesDescription, new DoubleArray(), false));
-      Parameters.Add(new OptionalValueParameter<GQAPSolution>("BestKnownSolution", BestKnownSolutionDescription, null, false));
+      Parameters.Add(new OptionalValueParameter<GQAPAssignment>("BestKnownSolution", BestKnownSolutionDescription, null, false));
       Parameters.Add(new OptionalValueParameter<GQAPAssignmentArchive>("BestKnownSolutions", BestKnownSolutionsDescription, null, false));
       Parameters.Add(new OptionalValueParameter<StringArray>("EquipmentNames", EquipmentNamesDescription, null, false));
@@ -243 +243 @@
         Weights = new DoubleMatrix(instance.CommunicationCosts);
         InstallationCosts = new DoubleMatrix(instance.ExecutionCosts.Transpose());
-        Distances = new DoubleMatrix(Capacities.Length, Capacities.Length); // all one, except diagonal
+        Distances = new DoubleMatrix(Capacities.Length, Capacities.Length);
         for (int i = 0; i < Capacities.Length - 1; i++)
           for (int j = i + 1; j < Capacities.Length; j++) {
             Distances[i, j] = 1;
-            Distances[j, i] = 1;
           }
 

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GQAPQualitySimilarityReducer.cs

@@ -101 +101 @@
         if (!similarities.Any()) {
           population.Add(candidate);
-        } else if (population.Count < populationSize) {
-          double maxSimilarity = similarities.Max();
-          if (maxSimilarity < 1.0)
-            population.Add(candidate);
+          break;
+        }
+        if (similarities.Max() == 1.0) break;
+        if (population.Count < populationSize) {
+          population.Add(candidate);
         } else {
           var replacement = population.Select((v, i) => new { V = v, Index = i })