Changeset 7418 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs

Timestamp:

01/27/12 02:01:25 (12 years ago)

Author:

abeham

Message:

#1614

• Added shaking operator based on n-moves
• Added pareto analyzer regarding flowdistance and installation qualities

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs

@@ -130 +130 @@
     }
 
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      // BackwardsCompatibility3.3
-      #region Backwards compatible code, remove with 3.4
-      if (!Parameters.ContainsKey("EquipmentNames"))
-        Parameters.Add(new LookupParameter<StringArray>("EquipmentNames", "Optional: A list of names that describes the equipments."));
-      if (!Parameters.ContainsKey("LocationNames"))
-        Parameters.Add(new LookupParameter<StringArray>("LocationNames", "Optional: A list of names that describes the locations."));
-      #endregion
-    }
-
     public override IOperation Apply() {
       var assignments = AssignmentParameter.ActualValue;
@@ -172 +161 @@
       GQAPAssignment assignment = BestSolutionParameter.ActualValue;
       if (assignment == null) {
-        assignment = new GQAPAssignment((IntegerVector)assignments[bestIndex].Clone(), (DoubleValue)qualities[bestIndex].Clone(),
-          equipmentNames, locationNames, distances, weights, installationCosts, demands, capacities, transportationCosts,
-          overbookedCapacityPenalty, flowDistanceQualities[bestIndex], installationQualities[bestIndex], overbookedCapacities[bestIndex]);
+        assignment = new GQAPAssignment((IntegerVector)assignments[bestIndex].Clone(), (DoubleValue)qualities[bestIndex].Clone(), flowDistanceQualities[bestIndex], overbookedCapacities[bestIndex], installationQualities[bestIndex], equipmentNames, locationNames, distances, weights, installationCosts, demands, capacities, transportationCosts, overbookedCapacityPenalty);
         assignment.Distances = distances;
         BestSolutionParameter.ActualValue = assignment;
         results.Add(new Result("Best GQAP Solution", assignment));
       } else {
-        if (HasSolutionImproved(assignment.Quality.Value, qualities[bestIndex].Value, maximization)) {
-          assignment.Assignment = (IntegerVector)assignments[bestIndex].Clone();
-          assignment.Quality = (DoubleValue)qualities[bestIndex].Clone();
+        if (HasSolutionImproved(assignment.Solution.Quality.Value, qualities[bestIndex].Value, maximization)) {
+          assignment.Solution = new GQAPSolution((IntegerVector)assignments[bestIndex].Clone(),
+            (DoubleValue)qualities[bestIndex].Clone(), (DoubleValue)flowDistanceQualities[bestIndex].Clone(),
+            (DoubleValue)installationQualities[bestIndex].Clone(), (DoubleValue)overbookedCapacities[bestIndex].Clone());
           assignment.EquipmentNames = equipmentNames;
           assignment.LocationNames = locationNames;
@@ -191 +179 @@
           assignment.TransportationCosts = transportationCosts;
           assignment.OverbookedCapacityPenalty = overbookedCapacityPenalty;
-          assignment.FlowDistanceQuality = (DoubleValue)flowDistanceQualities[bestIndex].Clone();
-          assignment.InstallationQuality = (DoubleValue)installationQualities[bestIndex].Clone();
-          assignment.OverbookedCapacity = (DoubleValue)overbookedCapacities[bestIndex].Clone();
         }
       }