Changeset 8346 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

Timestamp:

07/27/12 15:21:20 (12 years ago)

Author:

jkarder

Message:

#1331:

• added operators for the VehicleRouting problem
• minor code improvements

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -178 +178 @@
 
     private void AttachProblemInstanceEventHandlers() {
-      var solutionCreatorParameter = SolutionCreatorParameter as ConstrainedValueParameter<IVRPCreator>;
-      solutionCreatorParameter.ValidValues.Clear();
-
       if (ProblemInstance != null) {
         EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
-        IVRPCreator defaultCreator = null;
-        foreach (IVRPCreator creator in Operators.Where(o => o is IVRPCreator)) {
-          solutionCreatorParameter.ValidValues.Add(creator);
-          if (creator is Encodings.Alba.RandomCreator)
-            defaultCreator = creator;
-        }
-        if (defaultCreator != null)
-          solutionCreatorParameter.Value = defaultCreator;
-
         ProblemInstance.EvaluationChanged += new EventHandler(ProblemInstance_EvaluationChanged);
       }
@@ -246 +234 @@
 
     private void InitializeOperators() {
+      var solutionCreatorParameter = SolutionCreatorParameter as ConstrainedValueParameter<IVRPCreator>;
+      solutionCreatorParameter.ValidValues.Clear();
+
       Operators.Clear();
 
@@ -252 +243 @@
         ProblemInstance.Operators.Concat(
           ApplicationManager.Manager.GetInstances<IGeneralVRPOperator>().Cast<IOperator>()).OrderBy(op => op.Name));
+        Operators.Add(new VRPSimilarityCalculator());
+
+        IVRPCreator defaultCreator = null;
+        foreach (IVRPCreator creator in Operators.Where(o => o is IVRPCreator)) {
+          solutionCreatorParameter.ValidValues.Add(creator);
+          if (creator is Encodings.Alba.RandomCreator)
+            defaultCreator = creator;
+        }
+        if (defaultCreator != null)
+          solutionCreatorParameter.Value = defaultCreator;
       }
 
@@ -263 +264 @@
         }
       }
-    }
+      if (ProblemInstance != null) {
+        foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
+          op.SolutionParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
+          op.SolutionParameter.Hidden = true;
+        }
+        foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) {
+          op.ParentsParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
+          op.ParentsParameter.Hidden = true;
+        }
+        foreach (VRPSimilarityCalculator op in Operators.OfType<VRPSimilarityCalculator>()) {
+          op.SolutionVariableName = SolutionCreator.VRPToursParameter.ActualName;
+          op.QualityVariableName = ProblemInstance.SolutionEvaluator.QualityParameter.ActualName;
+          op.ProblemInstance = ProblemInstance;
+        }
+      }
+    }
+
     #endregion