Changeset 4370 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves

Timestamp:

09/08/10 11:37:00 (14 years ago)

Author:

svonolfe

Message:

Added move operators (WIP) (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves

Files:

• Interfaces (added)
• Interfaces/IMultiVRPMoveGenerator.cs (added)
• Interfaces/IMultiVRPMoveOperator.cs (added)
• Interfaces/IVRPMove.cs (added)
• MultiVRPMoveOperator (added)
• MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs (added)
• MultiVRPMoveOperator/MultiVRPMoveGenerator.cs (added)
• MultiVRPMoveOperator/MultiVRPMoveMaker.cs (added)
• VRPMoveMaker.cs (modified) (1 diff)
• VRPMoveOperator.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveMaker.cs

@@ -55 +55 @@
     private void UpdateMoveEvaluation() {
       IVRPEvaluator evaluator = ProblemInstance.EvaluatorParameter.Value;
-      foreach (IParameter parameter in evaluator.Parameters) {
-        if (parameter is ILookupParameter 
-          && parameter != evaluator.VRPToursParameter 
-          && parameter != evaluator.ProblemInstanceParameter) {
-          ILookupParameter evaluatorParameter = parameter as ILookupParameter;
+      ICollection<IParameter> addedParameters = new List<IParameter>();
+      
+      try {
+        foreach (IParameter parameter in evaluator.Parameters) {
+          if (parameter is ILookupParameter 
+            && parameter != evaluator.VRPToursParameter 
+            && parameter != evaluator.ProblemInstanceParameter) {
+            ILookupParameter evaluatorParameter = parameter as ILookupParameter;
           
-          string resultName = evaluatorParameter.ActualName;
-          if (!this.Parameters.Exists(p => p.Name == resultName)) {
-            ILookupParameter resultParameter = new LookupParameter<IItem>(resultName);
-            resultParameter.ExecutionContext = ExecutionContext;
-            this.Parameters.Add(resultParameter);
+            string resultName = evaluatorParameter.ActualName;
+            if (!this.Parameters.Exists(p => p.Name == resultName)) {
+              ILookupParameter resultParameter = new LookupParameter<IItem>(resultName);
+              resultParameter.ExecutionContext = ExecutionContext;
+              this.Parameters.Add(resultParameter);
+              addedParameters.Add(resultParameter);
+            }
+
+            string moveResultName = VRPMoveEvaluator.MovePrefix + resultName;
+            if (!this.Parameters.Exists(p => p.Name == moveResultName)) {
+              ILookupParameter moveResultParameter = new LookupParameter<IItem>(moveResultName);
+              moveResultParameter.ExecutionContext = ExecutionContext; 
+              this.Parameters.Add(moveResultParameter);
+              addedParameters.Add(moveResultParameter);
+            }
+
+            ILookupParameter result = Parameters[resultName] as ILookupParameter;
+            ILookupParameter moveResult = Parameters[moveResultName] as ILookupParameter;
+            result.ActualValue = moveResult.ActualValue.Clone() as IItem;
           }
-
-          string moveResultName = VRPMoveEvaluator.MovePrefix + resultName;
-          if (!this.Parameters.Exists(p => p.Name == moveResultName)) {
-            ILookupParameter moveResultParameter = new LookupParameter<IItem>(moveResultName);
-            moveResultParameter.ExecutionContext = ExecutionContext; 
-            this.Parameters.Add(moveResultParameter);
-          }
-
-          ILookupParameter result = Parameters[resultName] as ILookupParameter;
-          ILookupParameter moveResult = Parameters[moveResultName] as ILookupParameter;
-          result.ActualValue = moveResult.ActualValue.Clone() as IItem;
+        }
+      }
+      finally {
+        foreach(IParameter parameter in addedParameters) {
+          this.Parameters.Remove(parameter);
         }
       }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveOperator.cs

@@ -37 +37 @@
     }
 
+    public abstract ILookupParameter VRPMoveParameter { get; }
+
     [StorableConstructor]
     protected VRPMoveOperator(bool deserializing) : base(deserializing) { }