Changeset 11970 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Timestamp:

02/07/15 13:52:48 (10 years ago)

Author:

abeham

Message:

#2174:

• Added ISingleObjectiveOperator and IMultiObjectiveOperator interfaces
  • Added interface to all operators that would fall in either of these categories (excluding MainLoop operators)
• Added some checks in BasicProblem on whether the MultiEncoding is being used
  • A new event handler is added that reacts on encodings being removed or added to the MultiEncoding
• Added code to remove the non-fit operators in (Single|Multi)ObjectiveBasicProblem

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves

Files:

• MultiVRPMoveOperator/MultiVRPMoveTabuMaker.cs (modified) (1 diff)
• VRPMoveMaker.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuMaker.cs

@@ -33 +33 @@
   [Item("MultiVRPMoveTabuMaker", "A multi VRP move tabu maker.")]
   [StorableClass]
-  public class MultiVRPMoveTabuMaker : SingleSuccessorOperator, IMultiVRPMoveOperator, ITabuMaker, IGeneralVRPOperator {
+  public class MultiVRPMoveTabuMaker : SingleSuccessorOperator, IMultiVRPMoveOperator, ITabuMaker, IGeneralVRPOperator, ISingleObjectiveOperator {
     public ILookupParameter VRPMoveParameter {
       get { return (ILookupParameter)Parameters["VRPMove"]; }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveMaker.cs

@@ -32 +32 @@
   [Item("VRPMoveMaker", "Performs a VRP move.")]
   [StorableClass]
-  public abstract class VRPMoveMaker : VRPMoveOperator, IMoveMaker {
+  public abstract class VRPMoveMaker : VRPMoveOperator, IMoveMaker, ISingleObjectiveOperator {
     public ILookupParameter<DoubleValue> QualityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
@@ -91 +91 @@
           }
         }
-      }
-      finally {
+      } finally {
         foreach (IParameter parameter in addedParameters) {
           this.Parameters.Remove(parameter);