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

Timestamp:

09/06/10 17:05:13 (14 years ago)

Author:

svonolfe

Message:

Worked on VRP operators (WIP) (#1177)

File:

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

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

@@ -35 +35 @@
 using HeuristicLab.Problems.VehicleRouting.Parsers;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
+using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting {
@@ -61 +62 @@
       get { return BestKnownQualityParameter; }
     }
-    public IParameter SolutionCreatorParameter {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.SolutionCreatorParameter;
-        else
-          return null;
-      }
-    }
-    public IParameter EvaluatorParameter {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.EvaluatorParameter;
-        else
-          return null;
-      }
+    public IValueParameter<IVRPCreator> SolutionCreatorParameter {
+      get { return (IValueParameter<IVRPCreator>)Parameters["SolutionCreator"]; }
+    }
+    IParameter IProblem.SolutionCreatorParameter {
+      get { return SolutionCreatorParameter; }
+    }
+    public IValueParameter<IVRPEvaluator> EvaluatorParameter {
+      get { return (IValueParameter<IVRPEvaluator>)Parameters["Evaluator"]; }
+    }
+    IParameter IProblem.EvaluatorParameter {
+      get { return EvaluatorParameter; }
     }
     #endregion
@@ -86 +83 @@
 
     public ISingleObjectiveEvaluator Evaluator {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.EvaluatorParameter.Value;
-        else
-          return null;
-      }
+      get { return ProblemInstance.EvaluatorParameter.Value; }
     }
 
@@ -99 +91 @@
 
     public ISolutionCreator SolutionCreator {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.SolutionCreatorParameter.Value;
-        else
-          return null;
-      }
-    }
+      get { return ProblemInstance.SolutionCreatorParameter.Value; }
+    }
+
+    [Storable]
+    private List<IOperator> operators; 
 
     public IEnumerable<IOperator> Operators {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.Operators.OrderBy(op => op.Name);
-        else
-          return null;
-      }
+      get { return operators; }
     }
     #endregion
@@ -124 +109 @@
       Parameters.Add(new ValueParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance"));
       Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this VRP instance."));
- 
+
+      operators = new List<IOperator>();
+
       InitializeRandomVRPInstance();
+      InitializeOperators();
 
       AttachEventHandlers();
@@ -133 +121 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       VehicleRoutingProblem clone = (VehicleRoutingProblem)base.Clone(cloner);
+      clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
       clone.AttachEventHandlers();
       return clone;
@@ -172 +161 @@
 
     private void AttachProblemInstanceEventHandlers() {
+      if (Parameters.ContainsKey("Evaluator"))
+        Parameters.Remove("Evaluator");
+
+      if (Parameters.ContainsKey("SolutionCreator"))
+        Parameters.Remove("SolutionCreator");
+
       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);
       }
     }
@@ -180 +177 @@
     void ProblemInstanceParameter_ValueChanged(object sender, EventArgs e) {
       AttachProblemInstanceEventHandlers();
-    }
-
+      InitializeOperators();
+
+      OnSolutionCreatorChanged();
+      OnEvaluatorChanged();
+      OnOperatorsChanged();
+    }
     private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeSolutionCreator();
+      
       OnSolutionCreatorChanged();
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
       OnEvaluatorChanged();
+    }
+
+    private void InitializeOperators() {
+      operators = new List<IOperator>();
+
+      if (ProblemInstance != null) {
+        operators.AddRange(
+        ProblemInstance.Operators.Concat(
+          ApplicationManager.Manager.GetInstances<IGeneralVRPOperator>().Cast<IOperator>()).OrderBy(op => op.Name));
+      }
+
+      ParameterizeOperators();
+    }
+
+    private void ParameterizeSolutionCreator() {
+      if (SolutionCreator is IMultiVRPOperator) {
+        (SolutionCreator as IMultiVRPOperator).SetOperators(Operators);
+      }
+    }
+
+    private void ParameterizeOperators() {
+      foreach (IOperator op in Operators) {
+        if (op is IMultiVRPOperator) {
+          (op as IMultiVRPOperator).SetOperators(Operators);
+        }
+      }
     }
     #endregion