From 8946e130c8316329b4b19d9a85aa841197f9edc9 Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Mon, 17 Feb 2014 17:58:42 +0100 Subject: [PATCH] modified tests to deal with multiple cap-dims --- .../recreate/ServiceInsertionAndLoadConstraintsTest.java | 8 -------- .../recreate/ShipmentInsertionCalculatorTest.java | 8 +------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java index 1b3ba1a6..a7783eb0 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java +++ b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java @@ -117,14 +117,6 @@ public class ServiceInsertionAndLoadConstraintsTest { Inserter inserter = new Inserter(new InsertionListeners()); inserter.insertJob(delivery, new InsertionData(0,0,0,vehicle,null), route); -// inserter.insertJob(shipment2, new InsertionData(0,1,2,vehicle,null), route); -// inserter.insertJob(shipment2, new InsertionData(0,1,2,vehicle,null), route); - - - -// RouteActivityVisitor routeActVisitor = new RouteActivityVisitor(); -// routeActVisitor.addActivityVisitor(new UpdateLoads(stateManager)); -// routeActVisitor.visit(route); VehicleRoutingProblem vrp = mock(VehicleRoutingProblem.class); diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java index 0745c63e..1f3fe66c 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java +++ b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java @@ -228,13 +228,7 @@ public class ShipmentInsertionCalculatorTest { StateManager stateManager = new StateManager(vrp); stateManager.updateLoadStates(); stateManager.informInsertionStarts(Arrays.asList(route), null); - -// RouteActivityVisitor routeActVisitor = new RouteActivityVisitor(); -// routeActVisitor.addActivityVisitor(new UpdateLoads(stateManager)); -// routeActVisitor.visit(route); - - - + ConstraintManager constraintManager = new ConstraintManager(vrp,stateManager); constraintManager.addLoadConstraint(); // constraintManager.addConstraint(new PickupAndDeliverShipmentLoadActivityLevelConstraint(stateManager),Priority.CRITICAL);