Warehouse activity name changed to Home in order to get Beam works co…

…rrectly with tours
LBNL-UCB-STI · Apr 7, 2022 · 2059ebf · 2059ebf
1 parent c05b00f
commit 2059ebf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/main/R/freight/freight-processing.R b/src/main/R/freight/freight-processing.R
@@ -17,7 +17,7 @@ events <- readCsv(pp(workDir, "/5.events.csv.gz"))
 unloading <- events[actType=="Unloading"]
 nrow(unloading[type=="actstart"])
 nrow(unloading[type=="actend"])
-warehouse <- events[actType=="Warehouse"]
+warehouse <- events[actType=="Home"]
 nrow(warehouse[type=="actstart"])
 nrow(warehouse[type=="actend"])
 pt <- events[type=="PathTraversal"][,c("time","type","vehicleType","vehicle","secondaryFuelLevel",

diff --git a/src/main/scala/beam/agentsim/agents/freight/input/FreightReader.scala b/src/main/scala/beam/agentsim/agents/freight/input/FreightReader.scala
@@ -55,7 +55,7 @@ trait FreightReader {
   ): Plan = {
     val allToursPlanElements = tours.flatMap { tour =>
       val tourInitialActivity =
-        createFreightActivity("Warehouse", tour.warehouseLocationUTM, tour.departureTimeInSec, None)
+        createFreightActivity("Home", tour.warehouseLocationUTM, tour.departureTimeInSec, None)
       val firstLeg: Leg = createFreightLeg(tour.departureTimeInSec)
 
       val plans: IndexedSeq[PayloadPlan] = plansPerTour.get(tour.tourId) match {
@@ -82,7 +82,7 @@ trait FreightReader {
       elements
     }
 
-    val finalActivity = createFreightActivity("Warehouse", tours.head.warehouseLocationUTM, -1, None)
+    val finalActivity = createFreightActivity("Home", tours.head.warehouseLocationUTM, -1, None)
     val allPlanElements: IndexedSeq[PlanElement] = allToursPlanElements :+ finalActivity
 
     val currentPlan = PopulationUtils.createPlan(person)

diff --git a/src/test/scala/beam/agentsim/agents/freight/FreightReplannerSpec.scala b/src/test/scala/beam/agentsim/agents/freight/FreightReplannerSpec.scala
@@ -127,12 +127,12 @@ class FreightReplannerSpec extends AnyWordSpecLike with Matchers with BeamHelper
       plan.getPlanElements should have size 9
       plan.getPlanElements.get(0) shouldBe a[Activity]
       val activity0 = plan.getPlanElements.get(0).asInstanceOf[Activity]
-      activity0.getType should be("Warehouse")
+      activity0.getType should be("Home")
       activity0.getEndTime should be(11915.0)
       plan.getPlanElements.get(2).asInstanceOf[Activity].getType should be("Unloading")
       plan.getPlanElements.get(4).asInstanceOf[Activity].getType should be("Unloading")
       plan.getPlanElements.get(6).asInstanceOf[Activity].getType should be("Loading")
-      plan.getPlanElements.get(8).asInstanceOf[Activity].getType should be("Warehouse")
+      plan.getPlanElements.get(8).asInstanceOf[Activity].getType should be("Home")
     }
 
   }

diff --git a/src/test/scala/beam/agentsim/agents/freight/input/GenericFreightReaderSpec.scala b/src/test/scala/beam/agentsim/agents/freight/input/GenericFreightReaderSpec.scala
@@ -149,7 +149,7 @@ class GenericFreightReaderSpec extends AnyWordSpecLike with Matchers {
       plan4.getPlanElements.get(2).asInstanceOf[Activity].getCoord should be(
         new Coord(169900.11498160253, 3510.2356380579545)
       )
-      plan4.getPlanElements.get(4).asInstanceOf[Activity].getType should be("Warehouse")
+      plan4.getPlanElements.get(4).asInstanceOf[Activity].getType should be("Home")
     }
   }