creating helper for isShared

LBNL-UCB-STI · Aug 24, 2022 · 895a822 · 895a822
1 parent 87ac571
commit 895a822
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala b/src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
@@ -388,8 +388,9 @@ trait ChoosesMode {
           }
           var availableVehicles = newlyAvailableBeamVehicles.map(_.streetVehicle) :+ bodyStreetVehicle
           personData.currentTourMode match {
-            case Some(WALK_BASED) =>  availableVehicles = availableVehicles,
-            case Some(WALK_BASED) => availableVehicles = availableVehicles,
+
+            case Some(BIKE_BASED) =>  availableVehicles = newlyAvailableBeamVehicles.filterNot(v => BeamVehicle.isSharedTeleportationVehicle(v.id)).map(_.streetVehicle)
+            case Some(WALK_BASED) => availableVehicles = availableVehicles
             case Some(CAR_BASED) => availableVehicles = availableVehicles
           }
 

diff --git a/src/main/scala/beam/agentsim/agents/vehicles/BeamVehicle.scala b/src/main/scala/beam/agentsim/agents/vehicles/BeamVehicle.scala
@@ -546,6 +546,7 @@ object BeamVehicle {
 
   val idPrefixSharedTeleportationVehicle = "teleportationSharedVehicle"
   val idPrefixRideHail = "rideHailVehicle"
+  val idPrefixSharedVehicle = "sharedVehicle"
 
   def isRidehailVehicle(vehicleId: Id[BeamVehicle]): Boolean = {
     vehicleId.toString.startsWith(idPrefixRideHail)
@@ -554,6 +555,9 @@ object BeamVehicle {
   def isSharedTeleportationVehicle(vehicleId: Id[BeamVehicle]): Boolean = {
     vehicleId.toString.startsWith(idPrefixSharedTeleportationVehicle)
   }
+  def isSharedVehicle(vehicleId: Id[BeamVehicle]): Boolean = {
+    vehicleId.toString.startsWith(idPrefixSharedVehicle)
+  }
 
   def noSpecialChars(theString: String): String =
     theString