Changeset 4374 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW

Timestamp:

09/08/10 17:26:26 (14 years ago)

Author:

svonolfe

Message:

Added analyzers and views (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW

Files:

• CVRPTWEvaluator.cs (modified) (5 diffs)
• CVRPTWProblemInstance.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs

@@ -40 +40 @@
     public ILookupParameter<DoubleValue> TardinessParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["Tardiness"]; }
+    }
+
+    public ILookupParameter<DoubleValue> TravelTimeParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["TravelTime"]; }
     }
 
@@ -87 +91 @@
 
       (eval as CVRPTWEvaluation).Tardiness = tardiness;
+      (eval as CVRPTWEvaluation).TravelTime = time;
+
       double penalty = tardiness * vrptw.TardinessPenalty.Value;
       eval.Penalty += penalty;
@@ -97 +103 @@
 
       TardinessParameter.ActualValue = new DoubleValue(0);
+      TravelTimeParameter.ActualValue = new DoubleValue(0);
     }
 
@@ -103 +110 @@
 
       TardinessParameter.ActualValue.Value += (tourEvaluation as CVRPTWEvaluation).Tardiness;
+      TravelTimeParameter.ActualValue.Value += (tourEvaluation as CVRPTWEvaluation).TravelTime;
     }
     
@@ -110 +118 @@
     public CVRPTWEvaluator() {
       Parameters.Add(new LookupParameter<DoubleValue>("Tardiness", "The tardiness."));
+      Parameters.Add(new LookupParameter<DoubleValue>("TravelTime", "The travel time."));
     }
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs

@@ -74 +74 @@
       set { TardinessPenaltyParameter.Value = value; }
     }
-    
-    public override IEnumerable<IOperator> Operators {
-      get {
-        return base.Operators
-          .Where(o => o is ITimeWindowedOperator).Cast<IOperator>();
-      }
+
+    protected override IEnumerable<IOperator> GetOperators() {
+      return base.GetOperators()
+        .Where(o => o is ITimeWindowedOperator).Cast<IOperator>();
     }
 
+    protected override IEnumerable<IOperator> GetAnalyzers() {
+      return ApplicationManager.Manager.GetInstances<ITimeWindowedOperator>()
+        .Where(o => o is IAnalyzer)
+        .Cast<IOperator>().Union(base.GetAnalyzers());
+    }
+    
     protected override IVRPEvaluator Evaluator {
       get {