remove field name from CarrierService, incl. Builder

matsim-org · Dec 20, 2024 · 91a19fb · 91a19fb
1 parent 9e964e0
commit 91a19fb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/contribs/freight/src/main/java/org/matsim/freight/carriers/CarrierService.java b/contribs/freight/src/main/java/org/matsim/freight/carriers/CarrierService.java
@@ -36,7 +36,6 @@ public static Builder newInstance(Id<CarrierService> id, Id<Link> locationLinkId
 
 		private final Id<CarrierService> id;
 		private final Id<Link> locationLinkId;
-		private String name = "service";
 
 		private double serviceTime = 0.0;
 		private TimeWindow timeWindow = TimeWindow.newInstance(0.0, Integer.MAX_VALUE);
@@ -48,10 +47,6 @@ private Builder(Id<CarrierService> id, Id<Link> locationLinkId) {
 			this.locationLinkId = locationLinkId;
 		}
 
-		public Builder setName(String name){
-			this.name = name;
-			return this;
-		}
 
 		/**
 		 * By default, it is [0.0,Integer.MaxValue].
@@ -92,7 +87,6 @@ public Builder setCapacityDemand(int value) {
 
 	private final Id<CarrierService> id;
 	private final Id<Link> locationId;
-	private final String name;
 	private final double serviceDuration;
 	private final TimeWindow timeWindow;
 	private final int demand;
@@ -104,7 +98,6 @@ private CarrierService(Builder builder){
 		serviceDuration = builder.serviceTime;
 		timeWindow = builder.timeWindow;
 		demand = builder.demand;
-		name = builder.name;
 	}
 
 	@Override
@@ -148,12 +141,6 @@ public Attributes getAttributes() {
 		return attributes;
 	}
 
-	/**
-	 * @return the name
-	 */
-	public String getType() {
-		return name;
-	}
 
 	@Override
 	public String toString() {

diff --git a/contribs/freight/src/main/java/org/matsim/freight/carriers/Tour.java b/contribs/freight/src/main/java/org/matsim/freight/carriers/Tour.java
@@ -374,7 +374,7 @@ public CarrierService getService(){
 
 		@Override
 		public String getActivityType() {
-			return service.getType();
+			return CarrierConstants.SERVICE;
 		}
 
 		@Override

diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/CarriersUtilsTest.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/CarriersUtilsTest.java
@@ -68,7 +68,7 @@ void testAddAndGetServiceToCarrier() {
 		Carrier carrier = new CarrierImpl(Id.create("carrier", Carrier.class));
 		Id<CarrierService> serviceId = Id.create("testVehicle", CarrierService.class);
 		CarrierService service1 = CarrierService.Builder.newInstance(serviceId,Id.createLinkId("link0") )
-				.setName("service1").setCapacityDemand(15).setServiceDuration(30).build();
+				.setCapacityDemand(15).setServiceDuration(30).build();
 
 		//add Service
 		CarriersUtils.addService(carrier, service1);