Inm/#2067 adding param to adjust in demand following repositioning manager how many closest clusters to consider

src/main/resources/beam-template.conf

@@ -134,6 +134,8 @@ beam.agentsim.agents.rideHail.repositioningManager.timeout = "int | 0"
 # Larger value increase probability of the ride-hail vehicle to reposition
 beam.agentsim.agents.rideHail.repositioningManager.demandFollowingRepositioningManager.sensitivityOfRepositioningToDemand = "double | 1"
 beam.agentsim.agents.rideHail.repositioningManager.demandFollowingRepositioningManager.numberOfClustersForDemand = "int | 30"
+beam.agentsim.agents.rideHail.repositioningManager.demandFollowingRepositioningManager.fractionOfClosestClustersToConsider = "double | 0.2"
+
 beam.agentsim.agents.rideHail.allocationManager.repositionLowWaitingTimes.repositionCircleRadiusInMeters = "double | 3000"
 beam.agentsim.agents.rideHail.allocationManager.repositionLowWaitingTimes.minimumNumberOfIdlingVehiclesThresholdForRepositioning = "int | 1"
 beam.agentsim.agents.rideHail.allocationManager.repositionLowWaitingTimes.percentageOfVehiclesToReposition = "double | 0.01"

src/main/scala/beam/agentsim/agents/ridehail/repositioningmanager/DemandFollowingRepositioningManager.scala

@@ -130,17 +130,23 @@ class DemandFollowingRepositioningManager(val beamServices: BeamServices, val ri
   private def findWhereToReposition(tick: Int, vehicleLocation: Coord, vehicleId: Id[Vehicle]): Option[Coord] = {
     val currentHour = tick / 3600
     val nextHour = currentHour + 1
+    val fractionOfClosestClusters =
+      beamServices.beamConfig.beam.agentsim.agents.rideHail.repositioningManager.demandFollowingRepositioningManager.fractionOfClosestClustersToConsider
+
     hourToClusters.lift(nextHour).map { clusters =>
-      // We get top 5 closest clusters and randomly pick one of them.
+      val N: Int = Math.max(1, Math.round(clusters.length * fractionOfClosestClusters).toInt)
+
+      // We get top N closest clusters and randomly pick one of them.
       // The probability is proportional to the cluster size - meaning it is proportional to the demand, as higher demands as higher probability
-      val top5Closest = clusters.sortBy(x => beamServices.geo.distUTMInMeters(x.coord, vehicleLocation)).take(5)
-      val pmf = top5Closest.map { x =>
+      val topNClosest = clusters.sortBy(x => beamServices.geo.distUTMInMeters(x.coord, vehicleLocation)).take(N)
+      val pmf = topNClosest.map { x =>
         new CPair[ClusterInfo, java.lang.Double](x, x.size.toDouble)
       }.toList
+
       val distr = new EnumeratedDistribution[ClusterInfo](rng, pmf.asJava)
       val sampled = distr.sample()
       logger.debug(
-        s"tick $tick, currentHour: $currentHour, nextHour: $nextHour, vehicleId: $vehicleId, vehicleLocation: $vehicleLocation. Top 5 closest: ${top5Closest.toVector}, sampled: $sampled"
+        s"tick $tick, currentHour: $currentHour, nextHour: $nextHour, vehicleId: $vehicleId, vehicleLocation: $vehicleLocation. Top $N closest: ${topNClosest.toVector}, sampled: $sampled"
       )
       sampled.coord
     }

src/main/scala/beam/sim/config/BeamConfig.scala

@@ -1,3 +1,4 @@
+// generated by tscfg 0.9.4 on Thu Aug 15 19:31:00 MSK 2019
 // source: src/main/resources/beam-template.conf
 
 package beam.sim.config
@@ -998,6 +999,7 @@ object BeamConfig {
 
           object RepositioningManager {
             case class DemandFollowingRepositioningManager(
+              fractionOfClosestClustersToConsider: scala.Double,
               numberOfClustersForDemand: scala.Int,
               sensitivityOfRepositioningToDemand: scala.Double
             )
@@ -1008,6 +1010,10 @@ object BeamConfig {
                 c: com.typesafe.config.Config
               ): BeamConfig.Beam.Agentsim.Agents.RideHail.RepositioningManager.DemandFollowingRepositioningManager = {
                 BeamConfig.Beam.Agentsim.Agents.RideHail.RepositioningManager.DemandFollowingRepositioningManager(
+                  fractionOfClosestClustersToConsider =
+                    if (c.hasPathOrNull("fractionOfClosestClustersToConsider"))
+                      c.getDouble("fractionOfClosestClustersToConsider")
+                    else 0.2,
                   numberOfClustersForDemand =
                     if (c.hasPathOrNull("numberOfClustersForDemand")) c.getInt("numberOfClustersForDemand") else 30,
                   sensitivityOfRepositioningToDemand =

src/test/scala/beam/analysis/plots/VehicleMilesTraveledAnalysisSpec.scala

@@ -13,7 +13,7 @@ class VehicleMilesTraveledAnalysisSpec extends GenericAnalysisSpec with Matchers
   override def beforeAll(): Unit = {
     super.beforeAll()
 
-    vehicleTypes = beamServices.vehicleTypes.keySet
+    vehicleTypes = beamServices.beamScenario.vehicleTypes.keySet
     runAnalysis(new VehicleMilesTraveledAnalysis(vehicleTypes))
   }
 
@@ -25,11 +25,13 @@ class VehicleMilesTraveledAnalysisSpec extends GenericAnalysisSpec with Matchers
 
     "calculate total vehicle traveled " in {
 
+      val defaultHumanBodyBeamVehicleTypeId = Id.create("BODY-TYPE-DEFAULT", classOf[BeamVehicleType])
+
       import scala.collection.JavaConverters._
       summaryStats.asScala
         .filterNot(_._1.equalsIgnoreCase("motorizedVehicleMilesTraveled_total"))
         .filterNot(
-          _._1.equalsIgnoreCase(s"motorizedVehicleMilesTraveled_${BeamVehicleType.defaultHumanBodyBeamVehicleType.id}")
+          _._1.equalsIgnoreCase(s"motorizedVehicleMilesTraveled_$defaultHumanBodyBeamVehicleTypeId")
         )
         .filterNot(_._1.startsWith("vehicleMilesTraveled_"))
         .values