Hl/#1654 H3 Skimmer + Simple relocation algorithm for veh sharing

build.gradle

@@ -175,6 +175,8 @@ dependencies {
 
     compile "com.sigopt:sigopt-java:4.9.0"
 
+    compile("com.uber:h3:3.4.1")
+
     testCompile group: 'junit', name: 'junit', version: '4.8'
     testCompile group: 'org.mockito', name: 'mockito-inline', version: '2.27.0'
     testCompile group: "org.mockito", name: "mockito-core", version: "2.+"

src/main/resources/beam-template.conf

@@ -155,8 +155,8 @@ beam.agentsim.agents.rideHail.allocationManager.repositionLowWaitingTimes.waitin
 beam.agentsim.agents.rideHail.allocationManager.repositionLowWaitingTimes.demandWeight = "double | 4.0"
 beam.agentsim.agents.rideHail.allocationManager.repositionLowWaitingTimes.produceDebugImages = true
 beam.agentsim.agents.rideHail.allocationManager.alonsoMora.waitingTimeInSec = "int | 360"
-beam.agentsim.agents.rideHail.allocationManager.alonsoMora.travelTimeDelayAsFraction= "double | 0.2"
-beam.agentsim.agents.rideHail.allocationManager.alonsoMora.solutionSpaceSizePerVehicle = "int | 5"
+beam.agentsim.agents.rideHail.allocationManager.alonsoMora.excessRideTimeAsFraction= "double | 0.2"
+beam.agentsim.agents.rideHail.allocationManager.alonsoMora.numRequestsPerVehicle = "int | 5"
 beam.agentsim.agents.rideHail.pooledToRegularRideCostRatio = 0.6
 
 # human value of time taken from # https://theicct.org/sites/default/files/publications/Electric_shared_mobility_20190114.pdf
@@ -286,11 +286,30 @@ beam.replanning.ModuleProbability_4 = 0.0
 beam.replanning.fractionOfIterationsToDisableInnovation = "double | Double.PositiveInfinity"
 beam.replanning.cleanNonCarModesInIteration = "int | 0"
 
-#Skimmer
-beam.beamskimmer.writeObservedSkimsInterval = "int | 0"
-beam.beamskimmer.writeAllModeSkimsForPeakNonPeakPeriodsInterval = "int | 0"
-beam.beamskimmer.writeObservedSkimsPlusInterval = "int | 0" # Generic skimmer with a "label" and a "value" of type Double
-beam.beamskimmer.writeFullSkimsInterval = "int | 0"
+#h3
+beam.h3.resolution = "int | 10"
+beam.h3.lowerBoundResolution = "int | 10"
+
+#skims
+beam.router.skim = {
+  keepKLatestSkims = "int | 1"
+  writeSkimsInterval = "int | 0"
+  writeAggregatedSkimsInterval = "int | 0"
+  drive-time-skimmer {
+    name = "drive-time-skimmer"
+    fileBaseName = "String | skimsTravelTimeObservedVsSimulated"
+  }
+  origin-destination-skimmer {
+    name = "od-skimmer"
+    fileBaseName = "String | skimsOD"
+    writeAllModeSkimsForPeakNonPeakPeriodsInterval = "int | 0"
+    writeFullSkimsInterval = "int | 0"
+  }
+  taz-skimmer {
+    name = "taz-skimmer"
+    fileBaseName = "String | skimsTAZ"
+  }
+}
 
 ##################################################################
 # Warm Mode

src/main/scala/beam/agentsim/agents/PersonAgent.scala

@@ -1,6 +1,5 @@
 package beam.agentsim.agents
 
-import scala.annotation.tailrec
 import akka.actor.FSM.Failure
 import akka.actor.{ActorRef, FSM, Props, Stash, Status}
 import beam.agentsim.Resource._
@@ -22,17 +21,20 @@ import beam.agentsim.agents.vehicles.VehicleCategory.Bike
 import beam.agentsim.agents.vehicles._
 import beam.agentsim.events._
 import beam.agentsim.events.resources.{ReservationError, ReservationErrorCode}
+import beam.agentsim.infrastructure.parking.ParkingMNL
 import beam.agentsim.infrastructure.{ParkingInquiryResponse, ParkingStall}
 import beam.agentsim.scheduler.BeamAgentScheduler.{CompletionNotice, IllegalTriggerGoToError, ScheduleTrigger}
 import beam.agentsim.scheduler.Trigger
 import beam.agentsim.scheduler.Trigger.TriggerWithId
 import beam.router.Modes.BeamMode
 import beam.router.Modes.BeamMode.{CAR, CAV, RIDE_HAIL, RIDE_HAIL_POOLED, RIDE_HAIL_TRANSIT, WALK, WALK_TRANSIT}
+import beam.router.RouteHistory
 import beam.router.model.{EmbodiedBeamLeg, EmbodiedBeamTrip}
 import beam.router.osm.TollCalculator
-import beam.router.{BeamSkimmer, RouteHistory, TravelTimeObserved}
+import beam.router.skim.{DriveTimeSkimmerEvent, ODSkimmerEvent, ODSkims, Skims}
 import beam.sim.population.AttributesOfIndividual
 import beam.sim.{BeamScenario, BeamServices, Geofence}
+import beam.utils.logging.ExponentialLazyLogging
 import com.conveyal.r5.transit.TransportNetwork
 import com.vividsolutions.jts.geom.Envelope
 import org.matsim.api.core.v01.Id
@@ -42,9 +44,8 @@ import org.matsim.core.api.experimental.events.{EventsManager, TeleportationArri
 import org.matsim.core.utils.misc.Time
 import org.matsim.vehicles.Vehicle
 
+import scala.annotation.tailrec
 import scala.concurrent.duration._
-import beam.agentsim.infrastructure.parking.ParkingMNL
-import beam.utils.logging.ExponentialLazyLogging
 
 /**
   */
@@ -67,9 +68,7 @@ object PersonAgent {
     householdRef: ActorRef,
     plan: Plan,
     sharedVehicleFleets: Seq[ActorRef],
-    beamSkimmer: BeamSkimmer,
     routeHistory: RouteHistory,
-    travelTimeObserved: TravelTimeObserved,
     boundingBox: Envelope
   ): Props = {
     Props(
@@ -88,9 +87,7 @@ object PersonAgent {
         tollCalculator,
         householdRef,
         sharedVehicleFleets,
-        beamSkimmer,
         routeHistory,
-        travelTimeObserved,
         boundingBox
       )
     )
@@ -245,9 +242,7 @@ class PersonAgent(
   val tollCalculator: TollCalculator,
   val householdRef: ActorRef,
   val vehicleFleets: Seq[ActorRef] = Vector(),
-  val beamSkimmer: BeamSkimmer,
   val routeHistory: RouteHistory,
-  val travelTimeObserved: TravelTimeObserved,
   val boundingBox: Envelope
 ) extends DrivesVehicle[PersonData]
     with ChoosesMode
@@ -344,13 +339,14 @@ class PersonAgent(
             .foldLeft(tomorrowFirstLegDistance) { (sum, pair) =>
               sum + Math
                 .ceil(
-                  beamSkimmer
+                  Skims.od_skimmer
                     .getTimeDistanceAndCost(
                       pair.head.activity.getCoord,
                       pair.last.activity.getCoord,
                       0,
                       CAR,
-                      currentBeamVehicle.beamVehicleType.id
+                      currentBeamVehicle.beamVehicleType.id,
+                      beamServices
                     )
                     .distance
                 )
@@ -964,18 +960,22 @@ class PersonAgent(
           val generalizedCost = modeChoiceCalculator.getNonTimeCost(correctedTrip) + attributes
             .getVOT(generalizedTime)
           // Correct the trip to deal with ride hail / disruptions and then register to skimmer
-          beamSkimmer.observeTrip(
-            correctedTrip,
-            generalizedTime,
-            generalizedCost,
-            curFuelConsumed.primaryFuel + curFuelConsumed.secondaryFuel
-          )
-          travelTimeObserved.observeTrip(
-            correctedTrip,
-            generalizedTime,
-            generalizedCost,
-            curFuelConsumed.primaryFuel + curFuelConsumed.secondaryFuel
+          eventsManager.processEvent(
+            ODSkimmerEvent(
+              tick,
+              beamServices,
+              correctedTrip,
+              generalizedTime,
+              generalizedCost,
+              curFuelConsumed.primaryFuel + curFuelConsumed.secondaryFuel
+            )
           )
+
+          correctedTrip.legs.filter(x => x.beamLeg.mode == BeamMode.CAR || x.beamLeg.mode == BeamMode.CAV).foreach {
+            carLeg =>
+              eventsManager.processEvent(DriveTimeSkimmerEvent(tick, beamServices, carLeg))
+          }
+
           resetFuelConsumed()
 
           eventsManager.processEvent(

src/main/scala/beam/agentsim/agents/Population.scala

@@ -7,8 +7,8 @@ import beam.agentsim.agents.household.HouseholdActor
 import beam.agentsim.agents.vehicles.BeamVehicle
 import beam.agentsim.scheduler.BeamAgentScheduler.{CompletionNotice, ScheduleTrigger}
 import beam.agentsim.scheduler.Trigger.TriggerWithId
+import beam.router.RouteHistory
 import beam.router.osm.TollCalculator
-import beam.router.{BeamSkimmer, RouteHistory, TravelTimeObserved}
 import beam.sim.{BeamScenario, BeamServices}
 import com.conveyal.r5.transit.TransportNetwork
 import com.vividsolutions.jts.geom.Envelope
@@ -32,8 +32,6 @@ class Population(
   val sharedVehicleFleets: Seq[ActorRef],
   val eventsManager: EventsManager,
   val routeHistory: RouteHistory,
-  val beamSkimmer: BeamSkimmer,
-  val travelTimeObserved: TravelTimeObserved,
   boundingBox: Envelope
 ) extends Actor
     with ActorLogging {
@@ -119,8 +117,6 @@ class Population(
           homeCoord,
           sharedVehicleFleets,
           routeHistory,
-          beamSkimmer,
-          travelTimeObserved,
           boundingBox
         ),
         household.getId.toString
@@ -165,8 +161,6 @@ object Population {
     sharedVehicleFleets: Seq[ActorRef],
     eventsManager: EventsManager,
     routeHistory: RouteHistory,
-    beamSkimmer: BeamSkimmer,
-    travelTimeObserved: TravelTimeObserved,
     boundingBox: Envelope
   ): Props = {
     Props(
@@ -183,8 +177,6 @@ object Population {
         sharedVehicleFleets,
         eventsManager,
         routeHistory,
-        beamSkimmer,
-        travelTimeObserved,
         boundingBox
       )
     )