Changeset 6651

Timestamp:

08/11/11 06:41:19 (13 years ago)

Author:

abeham

Message:

#1614

• syncing

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

Files:

• Evaluators/GQAPEvaluator.cs (modified) (2 diffs)
• GeneralizedQuadraticAssignmentProblem.cs (modified) (4 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPEvaluator.cs

@@ -94 +94 @@
       DoubleArray demands = DemandsParameter.ActualValue;
       DoubleArray capacities = (DoubleArray)CapacitiesParameter.ActualValue.Clone();
+      double penalty = PenaltyParameter.ActualValue.Value;
       double quality = 0;
       double infeasibility = 0;
@@ -109 +110 @@
 
       InfeasibilityParameter.ActualValue = new DoubleValue(infeasibility);
-      QualityParameter.ActualValue = new DoubleValue(quality);
+      QualityParameter.ActualValue = new DoubleValue(quality + penalty * infeasibility);
       return base.Apply();
     }

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  [Item("Generalized Quadratic Assignment Problem", "")]
+  [Item("Generalized Quadratic Assignment Problem", "The Generalized Quadratic Assignment Problem (GQAP) is a generalization of the QAP in that it allows to assign multiple facilities (here called equipment) to a single location. The problem is described in Lee, C.G., and Ma, Z. 2003. The Generalized Quadratic Assignment Problem. Technical Report M5S 3G8, University of Toronto, Canada.")]
   [Creatable("Problems")]
   [StorableClass]
@@ -76 +76 @@
       set { InstallationCostsParameter.Value = value; }
     }
+    public DoubleValue TransportationCosts {
+      get { return TransportationCostsParameter.Value; }
+      set { TransportationCostsParameter.Value = value; }
+    }
     public DoubleArray Demands {
       get { return DemandsParameter.Value; }
@@ -91 +95 @@
     private GeneralizedQuadraticAssignmentProblem(GeneralizedQuadraticAssignmentProblem original, Cloner cloner)
       : base(original, cloner) {
-      // TODO: Clone your private fields here
       AttachEventHandlers();
     }
     public GeneralizedQuadraticAssignmentProblem()
       : base(new GQAPEvaluator(), new UniformRandomIntegerVectorCreator()) {
-      // TODO: Create a new instance of evaluator and solution creator
-
       Parameters.Add(new ValueParameter<DoubleMatrix>("Weights", "The weights matrix describes the flows between the equipments.", new DoubleMatrix()));
       Parameters.Add(new ValueParameter<DoubleMatrix>("Distances", "The distances matrix describes the distances between the locations at which the equipment can be installed.", new DoubleMatrix()));
@@ -106 +107 @@
       Parameters.Add(new OptionalValueParameter<IItem>("BestKnownSolution", "The best known solution (if available)", null));
 
+      Wei
 
       ParameterizeSolutionCreator();