Changeset 7412 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

Timestamp:

01/25/12 18:32:44 (12 years ago)

Author:

abeham

Message:

#1614: worked on GQAP and GRASP+PR

Location:

branches/GeneralizedQAP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (5 diffs)

branches/GeneralizedQAP

@@ -1 +1 @@
 *.suo
+TestResults

@@ -1 +1 @@
 *.suo
+TestResults

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

@@ -53 +53 @@
       get { return (ValueParameter<DoubleMatrix>)Parameters["InstallationCosts"]; }
     }
+    public ValueParameter<DoubleArray> DemandsParameter {
+      get { return (ValueParameter<DoubleArray>)Parameters["Demands"]; }
+    }
+    public ValueParameter<DoubleArray> CapacitiesParameter {
+      get { return (ValueParameter<DoubleArray>)Parameters["Capacities"]; }
+    }
     public FixedValueParameter<DoubleValue> TransportationCostsParameter {
       get { return (FixedValueParameter<DoubleValue>)Parameters["TransportationCosts"]; }
     }
-    public ValueParameter<DoubleArray> DemandsParameter {
-      get { return (ValueParameter<DoubleArray>)Parameters["Demands"]; }
-    }
-    public ValueParameter<DoubleArray> CapacitiesParameter {
-      get { return (ValueParameter<DoubleArray>)Parameters["Capacities"]; }
+    public FixedValueParameter<DoubleValue> OverbookedCapacityPenaltyParameter {
+      get { return (FixedValueParameter<DoubleValue>)Parameters["OverbookedCapacityPenalty"]; }
     }
     public OptionalValueParameter<IItem> BestKnownSolutionParameter {
@@ -80 +83 @@
       set { InstallationCostsParameter.Value = value; }
     }
+    public DoubleArray Demands {
+      get { return DemandsParameter.Value; }
+      set { DemandsParameter.Value = value; }
+    }
+    public DoubleArray Capacities {
+      get { return CapacitiesParameter.Value; }
+      set { CapacitiesParameter.Value = value; }
+    }
     public double TransportationCosts {
       get { return TransportationCostsParameter.Value.Value; }
       set { TransportationCostsParameter.Value.Value = value; }
     }
-    public DoubleArray Demands {
-      get { return DemandsParameter.Value; }
-      set { DemandsParameter.Value = value; }
-    }
-    public DoubleArray Capacities {
-      get { return CapacitiesParameter.Value; }
-      set { CapacitiesParameter.Value = value; }
+    public double OverbookedCapacityPenalty {
+      get { return TransportationCostsParameter.Value.Value; }
+      set { TransportationCostsParameter.Value.Value = value; }
     }
     #endregion
@@ -114 +121 @@
       Parameters.Add(new ValueParameter<DoubleMatrix>("InstallationCosts", "The installation costs matrix describes the installation costs of installing equipment i at location j", new DoubleMatrix()));
       Parameters.Add(new FixedValueParameter<DoubleValue>("TransportationCosts", "The transportation cost represents the flow-unit per distance-unit cost factor. This value can also be set to 1 if these costs are factored into the weights matrix already.", new DoubleValue(1)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("OverbookedCapacityPenalty", "The multiplier for the constraint violation when added to the quality.", new DoubleValue(1000)));
       Parameters.Add(new ValueParameter<DoubleArray>("Demands", "The demands vector describes the space requirements of the equipments.", new DoubleArray()));
       Parameters.Add(new ValueParameter<DoubleArray>("Capacities", "The capacities vector describes the available space at the locations.", new DoubleArray()));
@@ -183 +191 @@
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserializationHook() {
+    private void AfterDeserialization() {
       AttachEventHandlers();
     }
@@ -220 +228 @@
       }
       foreach (var op in Operators.OfType<IGQAPEvaluationOperator>()) {
+        op.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+        op.TransportationCostsParameter.ActualName = TransportationCostsParameter.Name;
+        op.OverbookedCapacityPenaltyParameter.ActualName = OverbookedCapacityPenaltyParameter.Name;
         op.WeightsParameter.ActualName = WeightsParameter.Name;
         op.DistancesParameter.ActualName = DistancesParameter.Name;
         op.InstallationCostsParameter.ActualName = InstallationCostsParameter.Name;
-        op.TransportationCostsParameter.ActualName = TransportationCostsParameter.Name;
         op.DemandsParameter.ActualName = DemandsParameter.Name;
         op.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
-        op.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
       }
       foreach (var op in Operators.OfType<IGQAPLocalImprovementOperator>()) {
+        op.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+        op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        op.FlowDistanceQualityParameter.ActualName = Evaluator.FlowDistanceQualityParameter.ActualName;
+        op.InstallationQualityParameter.ActualName = Evaluator.InstallationQualityParameter.ActualName;
+        op.OverbookedCapacityParameter.ActualName = Evaluator.OverbookedCapacityParameter.ActualName;
+        op.TransportationCostsParameter.ActualName = TransportationCostsParameter.Name;
+        op.OverbookedCapacityPenaltyParameter.ActualName = OverbookedCapacityPenaltyParameter.Name;
         op.WeightsParameter.ActualName = WeightsParameter.Name;
         op.DistancesParameter.ActualName = DistancesParameter.Name;
         op.InstallationCostsParameter.ActualName = InstallationCostsParameter.Name;
-        op.TransportationCostsParameter.ActualName = TransportationCostsParameter.Name;
         op.DemandsParameter.ActualName = DemandsParameter.Name;
         op.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
-        op.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
-        op.InfeasibilityParameter.ActualName = Evaluator.InfeasibilityParameter.ActualName;
       }
       foreach (var op in Operators.OfType<IGQAPManipulator>()) {
         op.IntegerVectorParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+      }
+      foreach (var op in Operators.OfType<IGQAPMerger>()) {
+        op.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+        op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        op.MaximizationParameter.ActualName = MaximizationParameter.Name;
       }
       foreach (var op in Operators.OfType<IGQAPMoveOperator>()) {

@@ -1 +1 @@
 *.suo
+TestResults