Changeset 7852 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

Timestamp:

05/21/12 13:46:48 (12 years ago)

Author:

svonolfe

Message:

Moved parameters from the ProblemInstance to the Problem (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (7 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -92 +92 @@
     }
 
+    public DoubleValue BestKnownQuality {
+      get { return BestKnownQualityParameter.Value; }
+      set { BestKnownQualityParameter.Value = value; }
+    }
+
     public ISingleObjectiveEvaluator Evaluator {
-      get { return ProblemInstance.EvaluatorParameter.Value; }
+      get { return EvaluatorParameter.Value; }
     }
 
@@ -101 +106 @@
 
     public ISolutionCreator SolutionCreator {
-      get { return ProblemInstance.SolutionCreatorParameter.Value; }
+      get { return SolutionCreatorParameter.Value; }
     }
 
@@ -121 +126 @@
       Parameters.Add(new OptionalValueParameter<VRPSolution>("BestKnownSolution", "The best known solution of this VRP instance."));
 
+      Parameters.Add(new ConstrainedValueParameter<IVRPCreator>("SolutionCreator", "The operator which should be used to create new VRP solutions."));
+      Parameters.Add(new ValueParameter<IVRPEvaluator>("Evaluator", "The operator which should be used to evaluate VRP solutions."));
+
+      EvaluatorParameter.Hidden = true;
+
       operators = new List<IOperator>();
 
@@ -175 +185 @@
 
     private void AttachProblemInstanceEventHandlers() {
-      if (Parameters.ContainsKey("Evaluator"))
-        Parameters.Remove("Evaluator");
-
-      if (Parameters.ContainsKey("SolutionCreator"))
-        Parameters.Remove("SolutionCreator");
-
-      if (Parameters.ContainsKey("BestKnownSolution"))
-        Parameters.Remove("BestKnownSolution");
-
-      if (Parameters.ContainsKey("BestKnownQuality"))
-        Parameters.Remove("BestKnownQuality");
-
+      var solutionCreatorParameter = SolutionCreatorParameter as ConstrainedValueParameter<IVRPCreator>;
+      solutionCreatorParameter.ValidValues.Clear();
 
       if (ProblemInstance != null) {
-        ProblemInstance.SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
-        ProblemInstance.EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
-        Parameters.Add(ProblemInstance.EvaluatorParameter);
-        Parameters.Add(ProblemInstance.SolutionCreatorParameter);
-
-        Parameters.Add(ProblemInstance.BestKnownQualityParameter);
-        Parameters.Add(ProblemInstance.BestKnownSolutionParameter);
+        EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
+        foreach (IVRPCreator creator in ProblemInstance.Operators.Where(o => o is IVRPCreator)) {
+          solutionCreatorParameter.ValidValues.Add(creator);
+        }
+        ProblemInstance.EvaluationChanged += new EventHandler(ProblemInstance_EvaluationChanged);
+      }      
+    }
+
+    void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
+      if (BestKnownSolution != null) {
+        //call evaluator
+        BestKnownQuality = new DoubleValue(ProblemInstance.Evaluate(BestKnownSolution.Solution).Quality);
+        BestKnownSolution.Quality = BestKnownQuality;
+      } else {
+        BestKnownQuality = null;
       }
     }
@@ -260 +268 @@
       parser.Parse();
 
+      this.Name = parser.ProblemName;
       MDCVRPTWProblemInstance problem = new MDCVRPTWProblemInstance();
 
@@ -291 +300 @@
       parser.Parse();
 
+      this.Name = parser.ProblemName;
       CVRPPDTWProblemInstance problem = new CVRPPDTWProblemInstance();
 
@@ -444 +454 @@
       else {
         VRPSolution solution = new VRPSolution(ProblemInstance, encoding, new DoubleValue(0));
-        ProblemInstance.BestKnownSolutionParameter.Value = solution;
+        BestKnownSolutionParameter.Value = solution;
       }
     }