minor change based on code inspection; optimize imports

matsim-vsp · Jan 19, 2024 · 1cb4168 · 1cb4168
1 parent a8ad2b0
commit 1cb4168
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/MaybeTodayAssigner.java b/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/MaybeTodayAssigner.java
@@ -22,9 +22,8 @@
 
 import java.util.Random;
 import org.matsim.core.gbl.Gbl;
-import org.matsim.freight.logistics.LSP;
-import org.matsim.freight.logistics.LSPPlan;
 import org.matsim.freight.logistics.InitialShipmentAssigner;
+import org.matsim.freight.logistics.LSPPlan;
 import org.matsim.freight.logistics.shipment.LSPShipment;
 
 /*package-private*/ class MaybeTodayAssigner implements InitialShipmentAssigner {

diff --git a/...im/freight/logistics/example/lsp/multipleChains/PrimaryLogisticChainShipmentAssigner.java b/...im/freight/logistics/example/lsp/multipleChains/PrimaryLogisticChainShipmentAssigner.java
@@ -1,10 +1,9 @@
 package org.matsim.freight.logistics.example.lsp.multipleChains;
 
 import org.matsim.core.gbl.Gbl;
-import org.matsim.freight.logistics.LSP;
+import org.matsim.freight.logistics.InitialShipmentAssigner;
 import org.matsim.freight.logistics.LSPPlan;
 import org.matsim.freight.logistics.LogisticChain;
-import org.matsim.freight.logistics.InitialShipmentAssigner;
 import org.matsim.freight.logistics.shipment.LSPShipment;
 
 /**

diff --git a/...sim/freight/logistics/example/lsp/multipleChains/RandomLogisticChainShipmentAssigner.java b/...sim/freight/logistics/example/lsp/multipleChains/RandomLogisticChainShipmentAssigner.java
@@ -22,7 +22,7 @@ class RandomLogisticChainShipmentAssigner implements InitialShipmentAssigner {
 
   @Override
   public void assignToPlan(LSPPlan lspPlan, LSPShipment shipment) {
-    Gbl.assertIf(lspPlan.getLogisticChains().size() > 0);
+    Gbl.assertIf(!lspPlan.getLogisticChains().isEmpty());
     List<LogisticChain> logisticChains = new ArrayList<>(lspPlan.getLogisticChains());
     Random rand = MatsimRandom.getRandom();
     int index = rand.nextInt(logisticChains.size());

diff --git a/...freight/logistics/example/lsp/multipleChains/RoundRobinLogisticChainShipmentAssigner.java b/...freight/logistics/example/lsp/multipleChains/RoundRobinLogisticChainShipmentAssigner.java
@@ -4,10 +4,9 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import org.matsim.core.gbl.Gbl;
-import org.matsim.freight.logistics.LSP;
+import org.matsim.freight.logistics.InitialShipmentAssigner;
 import org.matsim.freight.logistics.LSPPlan;
 import org.matsim.freight.logistics.LogisticChain;
-import org.matsim.freight.logistics.InitialShipmentAssigner;
 import org.matsim.freight.logistics.shipment.LSPShipment;
 
 /**
@@ -26,7 +25,7 @@ class RoundRobinLogisticChainShipmentAssigner implements InitialShipmentAssigner
 
   @Override
   public void assignToPlan(LSPPlan lspPlan, LSPShipment shipment) {
-    Gbl.assertIf(lspPlan.getLogisticChains().size() > 0);
+    Gbl.assertIf(!lspPlan.getLogisticChains().isEmpty());
     // prepare the map if empty for the first time with each number of assigned shipments being zero
     if (shipmentCountByChain.isEmpty()) {
       for (LogisticChain chain : lspPlan.getLogisticChains()) {

diff --git a/...sim/freight/logistics/example/lspAndDemand/requirementsChecking/RequirementsAssigner.java b/...sim/freight/logistics/example/lspAndDemand/requirementsChecking/RequirementsAssigner.java
@@ -22,10 +22,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import org.matsim.freight.logistics.LSP;
+import org.matsim.freight.logistics.InitialShipmentAssigner;
 import org.matsim.freight.logistics.LSPPlan;
 import org.matsim.freight.logistics.LogisticChain;
-import org.matsim.freight.logistics.InitialShipmentAssigner;
 import org.matsim.freight.logistics.shipment.LSPShipment;
 import org.matsim.freight.logistics.shipment.Requirement;
 

diff --git a/...matsim/freight/logistics/resourceImplementations/SingleLogisticChainShipmentAssigner.java b/...matsim/freight/logistics/resourceImplementations/SingleLogisticChainShipmentAssigner.java
@@ -21,10 +21,9 @@
 package org.matsim.freight.logistics.resourceImplementations;
 
 import org.matsim.core.gbl.Gbl;
-import org.matsim.freight.logistics.LSP;
+import org.matsim.freight.logistics.InitialShipmentAssigner;
 import org.matsim.freight.logistics.LSPPlan;
 import org.matsim.freight.logistics.LogisticChain;
-import org.matsim.freight.logistics.InitialShipmentAssigner;
 import org.matsim.freight.logistics.shipment.LSPShipment;
 
 /**