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

Timestamp:

01/26/12 14:50:56 (12 years ago)

Author:

abeham

Message:

#1614: improved results output of GQAP

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (5 diffs)

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

@@ -68 +68 @@
       get { return (OptionalValueParameter<IItem>)Parameters["BestKnownSolution"]; }
     }
+    public OptionalValueParameter<StringArray> EquipmentNamesParameter {
+      get { return (OptionalValueParameter<StringArray>)Parameters["EquipmentNames"]; }
+    }
+    public OptionalValueParameter<StringArray> LocationNamesParameter {
+      get { return (OptionalValueParameter<StringArray>)Parameters["LocationNames"]; }
+    }
     #endregion
 
@@ -99 +105 @@
       set { TransportationCostsParameter.Value.Value = value; }
     }
+    public StringArray EquipmentNames {
+      get { return EquipmentNamesParameter.Value; }
+      set { EquipmentNamesParameter.Value = value; }
+    }
+    public StringArray LocationNames {
+      get { return LocationNamesParameter.Value; }
+      set { LocationNamesParameter.Value = value; }
+    }
     #endregion
 
-    [Storable]
-    private BestGQAPSolutionAnalyzer bestSolutionAnalyzer;
     public BestGQAPSolutionAnalyzer BestSolutionAnalyzer {
-      get { return bestSolutionAnalyzer; }
-      set { bestSolutionAnalyzer = value; }
+      get { return Operators.OfType<BestGQAPSolutionAnalyzer>().First(); }
     }
 
@@ -112 +123 @@
     private GeneralizedQuadraticAssignmentProblem(GeneralizedQuadraticAssignmentProblem original, Cloner cloner)
       : base(original, cloner) {
-      bestSolutionAnalyzer = cloner.Clone(original.bestSolutionAnalyzer);
       AttachEventHandlers();
     }
@@ -201 +211 @@
 
     private void InitializeOperators() {
+      Operators.Add(new BestGQAPSolutionAnalyzer());
+      Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPOperator>());
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IIntegerVectorOperator>());
-      Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPOperator>());
       Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPMoveEvaluator>());
-      Operators.Add(new BestGQAPSolutionAnalyzer());
       Parameterize();
     }
@@ -276 +286 @@
 
       if (BestSolutionAnalyzer != null) {
-        BestSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        BestSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
         BestSolutionAnalyzer.DistancesParameter.ActualName = DistancesParameter.Name;
         BestSolutionAnalyzer.WeightsParameter.ActualName = WeightsParameter.Name;
+        BestSolutionAnalyzer.InstallationCostsParameter.ActualName = InstallationCostsParameter.Name;
+        BestSolutionAnalyzer.DemandsParameter.ActualName = DemandsParameter.Name;
+        BestSolutionAnalyzer.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
+        BestSolutionAnalyzer.TransportationCostsParameter.ActualName = TransportationCostsParameter.Name;
+        BestSolutionAnalyzer.OverbookedCapacityPenaltyParameter.ActualName = OverbookedCapacityPenaltyParameter.Name;
         BestSolutionAnalyzer.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+        BestSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        BestSolutionAnalyzer.FlowDistanceQualityParameter.ActualName = Evaluator.FlowDistanceQualityParameter.ActualName;
+        BestSolutionAnalyzer.InstallationQualityParameter.ActualName = Evaluator.InstallationQualityParameter.ActualName;
+        BestSolutionAnalyzer.OverbookedCapacityParameter.ActualName = Evaluator.OverbookedCapacityParameter.ActualName;
         BestSolutionAnalyzer.ResultsParameter.ActualName = "Results";
         BestSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
-        BestSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+        BestSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
+        BestSolutionAnalyzer.EquipmentNamesParameter.ActualName = EquipmentNamesParameter.Name;
+        BestSolutionAnalyzer.LocationNamesParameter.ActualName = LocationNamesParameter.Name;
       }
     }