Changeset 5867 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

Timestamp:

03/29/11 15:40:01 (13 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (4 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -32 +32 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Common;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
@@ -39 +40 @@
     public IValueParameter<IVRPEvaluator> EvaluatorParameter {
       get { return (ValueParameter<IVRPEvaluator>)Parameters["Evaluator"]; } 
+    }
+
+    IVRPEvaluator moveEvaluator;
+
+    public IVRPEvaluator MoveEvaluator {
+      get {
+        if (EvaluatorParameter.Value == null)
+          return null;
+        else {
+          if (moveEvaluator == null) {
+            moveEvaluator = EvaluatorParameter.Value.Clone() as IVRPEvaluator;
+
+            foreach (IParameter parameter in moveEvaluator.Parameters) {
+              if (parameter is ILookupParameter
+                && parameter != moveEvaluator.ProblemInstanceParameter
+                && parameter != moveEvaluator.VRPToursParameter) {
+                (parameter as ILookupParameter).ActualName =
+                  VRPMoveEvaluator.MovePrefix +
+                  (parameter as ILookupParameter).ActualName;
+              }
+            }
+          }
+
+          return moveEvaluator;
+        }
+      }
     }
 
@@ -253 +280 @@
 
     private void AttachEventHandlers() {
+      EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
       BestKnownSolutionParameter.ValueChanged += new EventHandler(BestKnownSolutionParameter_ValueChanged);
       DistanceFactorParameter.ValueChanged += new EventHandler(DistanceFactorParameter_ValueChanged);
@@ -268 +296 @@
 
     #region Event handlers
+    void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
+      moveEvaluator = null;
+    }
+
     void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) {
       EvalBestKnownSolution();