Merge pull request #2372 from LBNL-UCB-STI/hl/ridehail-fix-and-data-c…

…ollection

Hl/ridehail fix and data collection

build.gradle

@@ -225,6 +225,10 @@ dependencies {
     compile "com.github.vagmcs:optimus_${scalaBinaryVersion}:3.1.0"
     compile "com.github.vagmcs:optimus-solver-oj_${scalaBinaryVersion}:3.1.0"
 
+    compile("io.github.oliviercailloux:google-or-tools:6.7.2") {
+        exclude group: 'com.google.protobuf', module: 'protobuf-java'
+    }
+
     ////////////////////////////////////
     ///Performance Monitoring (Kamon)///
     ////////////////////////////////////
@@ -443,7 +447,7 @@ def jmx = ["-Dcom.sun.management.jmxremote", "-Dcom.sun.management.jmxremote.por
 // UseParallelGC
 applicationDefaultJvmArgs = ["-Xmx${myAvailableRam}g", "-Xms${myAvailableRam/2}g",
                              "-XX:+UseParallelGC", "-XX:+UseParallelOldGC", "-XX:MetaspaceSize=150M", "-Djava.awt.headless=true",
-                             "-Dlogback.configurationFile=logback_prod.xml"] + logGC + jmx
+                             "-Dlogback.configurationFile=logback_prod.xml", "-Xss2048k"] + logGC + jmx
 
 println(applicationDefaultJvmArgs)
 

src/main/python/smart/smartplots3_setup.py

@@ -307,9 +307,9 @@ def pltLdvRhOccupancy(_plt_setup3, _output_folder):
     #     plt.bar(x=top_labels_xpos, height=data['rh_2p'], bottom=data[['non_rh_ldv', 'rh_1p']].sum(axis=1), hatch='xxx', fill=False, linewidth=0)
     #     plt.bar(x=top_labels_xpos, height=data['rh_3p'], bottom=data[['non_rh_ldv', 'rh_1p', 'rh_2p']].sum(axis=1), hatch='|||', fill=False, linewidth=0)
     #     plt.bar(x=top_labels_xpos, height=data['rh_4p'], bottom=data[['non_rh_ldv', 'rh_1p', 'rh_2p', 'rh_3p']].sum(axis=1), hatch='....', fill=False, linewidth=0)
-    #     shared_2p = mpatches.Patch(facecolor='white', label='The white data', hatch='xxx')
-    #     shared_3p = mpatches.Patch(facecolor='white', label='The white data', hatch='|||')
-    #     shared_4p = mpatches.Patch(facecolor='white', label='The white data', hatch='....')
+    #     shared_2p = mpatches.Patch(facecolor='white', key='The white data', hatch='xxx')
+    #     shared_3p = mpatches.Patch(facecolor='white', key='The white data', hatch='|||')
+    #     shared_4p = mpatches.Patch(facecolor='white', key='The white data', hatch='....')
 
     plt.xticks(bottom_labels_xpos, bottom_labels, rotation=angle, ha=horizontal_align)
     #     plt.legend((plt_non_rh_ldv, plt_rh_1p, plt_rh_shared, shared_2p, shared_3p, shared_4p),

src/main/resources/beam-template.conf

@@ -285,12 +285,9 @@ beam.replanning.ModuleProbability_4 = 0.0
 beam.replanning.fractionOfIterationsToDisableInnovation = "double | Double.PositiveInfinity"
 beam.replanning.cleanNonCarModesInIteration = "int | 0"
 
-#h3
-beam.h3.resolution = "int | 10"
-beam.h3.lowerBoundResolution = "int | 10"
-
 #skims
 beam.router.skim = {
+  h3Resolution = "int | 6"
   keepKLatestSkims = "int | 1"
   writeSkimsInterval = "int | 0"
   writeAggregatedSkimsInterval = "int | 0"
@@ -307,6 +304,7 @@ beam.router.skim = {
   taz-skimmer {
     name = "taz-skimmer"
     fileBaseName = "String | skimsTAZ"
+    timeBin = "int | 300"
   }
 }
 

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

@@ -23,7 +23,7 @@ case class MobilityRequest(
   tag: MobilityRequestType,
   serviceTime: Int,
   upperBoundTime: Int,
-  serviceDistance: Int,
+  serviceDistance: Double,
   pickupRequest: Option[MobilityRequest] = None,
   routingRequestId: Option[Int] = None,
   vehicleOccupancy: Option[Int] = None,

src/main/scala/beam/agentsim/agents/planning/BeamPlan.scala

@@ -23,7 +23,7 @@ import scala.collection.mutable
   * is the first Activity of the day, which contains only that activity.
   *
   * In addition, a BeamPlan contains mappings from PlanElements to Strategies. A Strategy
-  * is essentially a label that is assigned during initialization or Replanning and used during the MobSim
+  * is essentially a key that is assigned during initialization or Replanning and used during the MobSim
   * to influence within-day Agent behavior. Strategies can be mapped to a Plan at any level (e.g. the whole plan,
   * to a tour, a trip, etc.) but can be looked up at any level as well (allowing a Tour to have a strategy and a
   * lookup on a Leg within that tour will yield that strategy).