make addPlan and setSelectedPlan behave according to their name.

contribs/commercialTrafficApplications/src/main/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/TourPlanning.java

@@ -176,7 +176,7 @@ static void runTourPlanningForCarriers(Carriers carriers, Scenario scenario, VRP
 																									// plans
 			log.info("routing for carrier " + carrier.getId() + " finished. Tour planning plus routing took "
 					+ (System.currentTimeMillis() - start) / 1000 + " seconds.");
-			carrier.setSelectedPlan(carrierPlan);
+			carrier.addPlan(carrierPlan);
 		})).get();
 		;
 	}

contribs/freight/src/main/java/org/matsim/freight/carriers/usecases/chessboard/InitialCarrierPlanCreator.java

@@ -170,7 +170,7 @@ public static void main(String[] args) {
 
         for(Carrier carrier : carriers.getCarriers().values()){
             CarrierPlan plan = new InitialCarrierPlanCreator(scenario.getNetwork()).createPlan(carrier);
-            carrier.setSelectedPlan(plan);
+            carrier.addPlan(plan);
         }
 
         new CarrierPlanWriter(carriers).write("input/usecases/chessboard/freight/carrierPlans_10minTW.xml");

contribs/freight/src/test/java/org/matsim/freight/carriers/jsprit/FixedCostsTest.java

@@ -176,7 +176,7 @@ public void setUp() {
 			//Routing bestPlan to Network
 			CarrierPlan carrierPlan = MatsimJspritFactory.createPlan(carrier, bestSolution) ;
 			NetworkRouter.routePlan(carrierPlan,netBasedCosts) ;
-			carrier.setSelectedPlan(carrierPlan) ;
+			carrier.addPlan(carrierPlan) ;
 			carriersPlannedAndRouted.addCarrier(carrier);
 		}
 	}

contribs/freight/src/test/java/org/matsim/freight/carriers/jsprit/IntegrationIT.java

@@ -146,7 +146,7 @@ private static double generateCarrierPlans(Network network, Carriers carriers, C
 			// (maybe not optimal, but since re-routing is a matsim strategy,
 			// certainly ok as initial solution)
 
-			carrier.setSelectedPlan(newPlan);
+			carrier.addPlan(newPlan);
 
 			SolutionPrinter.print(problem, solution, SolutionPrinter.Print.VERBOSE);
 			score = score + newPlan.getJspritScore();

contribs/freight/src/test/java/org/matsim/freight/carriers/jsprit/SkillsIT.java

@@ -93,7 +93,7 @@ private VehicleRoutingProblemSolution generateCarrierPlans(Scenario scenario) {
 		CarrierPlan newPlan = MatsimJspritFactory.createPlan(carrier, solution);
 
 		NetworkRouter.routePlan(newPlan, networkBasedTransportCosts);
-		carrier.setSelectedPlan(newPlan);
+		carrier.addPlan(newPlan);
 		SolutionPrinter.print(problem, solution, SolutionPrinter.Print.VERBOSE);
 
 //		new CarrierPlanXmlWriterV3(CarrierControlerUtils.getCarriers(scenario)).write(utils.getOutputDirectory() + "carriers.xml");

contribs/freight/src/test/java/org/matsim/freight/carriers/utils/CarrierControlerUtilsIT.java

@@ -140,7 +140,7 @@ public void setUp() {
 				//Routing bestPlan to Network
 			CarrierPlan carrierPlanServicesAndShipments = MatsimJspritFactory.createPlan(carrier, bestSolution) ;
 			NetworkRouter.routePlan(carrierPlanServicesAndShipments,netBasedCosts) ;
-			carrier.setSelectedPlan(carrierPlanServicesAndShipments) ;
+			carrier.addPlan(carrierPlanServicesAndShipments) ;
 		}
 
 		/*
@@ -168,7 +168,7 @@ public void setUp() {
 				//Routing bestPlan to Network
 			CarrierPlan carrierPlanServicesAndShipments = MatsimJspritFactory.createPlan(carrier, bestSolution) ;
 			NetworkRouter.routePlan(carrierPlanServicesAndShipments,netBasedCosts) ;
-			carrier.setSelectedPlan(carrierPlanServicesAndShipments) ;
+			carrier.addPlan(carrierPlanServicesAndShipments) ;
 		}
 
 		carrierWShipmentsOnlyFromCarrierWServices = carriersWithShipmentsOnly.getCarriers().get(CARRIER_SERVICES_ID);		//with converted Service

contribs/freight/src/test/java/org/matsim/freight/carriers/utils/CarrierControlerUtilsTest.java

@@ -149,7 +149,7 @@ public void setUp() {
 			//Routing bestPlan to Network
 		CarrierPlan carrierPlanServicesAndShipments = MatsimJspritFactory.createPlan(carrierWServices, bestSolution) ;
 		NetworkRouter.routePlan(carrierPlanServicesAndShipments,netBasedCosts) ;
-		carrierWServices.setSelectedPlan(carrierPlanServicesAndShipments) ;
+		carrierWServices.addPlan(carrierPlanServicesAndShipments) ;
 
 		/*
 		 * Now convert it to a only shipment-based VRP.

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTriggersCarrierReplanningListener.java

@@ -115,7 +115,7 @@ public void notifyIterationStarts(IterationStartsEvent event) {
             NetworkRouter.routePlan(newPlan, netBasedCosts);
 
             //assign this plan now to the carrier and make it the selected carrier plan
-            carrier.setSelectedPlan(newPlan);
+            carrier.addPlan(newPlan);
 
         }
         String outputdirectory = sc.getConfig().controller().getOutputDirectory();

contribs/small-scale-traffic-generation/src/main/java/org/matsim/smallScaleCommercialTrafficGeneration/DefaultIntegrateExistingTrafficToSmallScaleCommercialImpl.java

@@ -311,6 +311,7 @@ public void readExistingCarriersFromFolder(Scenario scenario, double sampleScena
 				else if (!carrier.getShipments().isEmpty())
 					newCarrier.getShipments().putAll(carrier.getShipments());
 				if (carrier.getSelectedPlan() != null) {
+					newCarrier.addPlan(carrier.getSelectedPlan());
 					newCarrier.setSelectedPlan(carrier.getSelectedPlan());
 
 					List<String> startAreas = new ArrayList<>();