Merge master into develop

aws/src/main/python/beam_lambda/lambda_function.py

@@ -14,8 +14,8 @@
 
 S3_PUBLISH_SCRIPT = '''
   -    sleep 10s
-  -    opth="output/$(basename $(dirname $cf))"
-  -    echo opth
+  -    opth="output"
+  -    echo $opth
   -    for file in glob.iglob($opth/*); do sudo cp /var/log/cloud-init-output.log "$file" && sudo zip -r "${file%.*}_$UID.zip" "$file"; done;
   -    for file in glob.iglob($opth/*.zip); do s3p="$s3p, https://s3.us-east-2.amazonaws.com/beam-outputs/$(os.path.basename($file))"; done;
   -    sudo aws --region "$S3_REGION" s3 cp $opth/*.zip s3://beam-outputs/'''
@@ -109,6 +109,7 @@
                   'r5.large', 'r5.xlarge', 'r5.2xlarge', 'r5.4xlarge', 'r5.12xlarge', 'r5.24xlarge',
                   'r5d.large', 'r5d.xlarge', 'r5d.2xlarge', 'r5d.4xlarge', 'r5d.12xlarge', 'r5d.24xlarge',
                   'm5d.large', 'm5d.xlarge', 'm5d.2xlarge', 'm5d.4xlarge', 'm5d.12xlarge', 'm5d.24xlarge',
+                  'm5a.24xlarge',
                   'z1d.large', 'z1d.xlarge', 'z1d.2xlarge', 'z1d.3xlarge', 'z1d.6xlarge', 'z1d.12xlarge']
 
 regions = ['us-east-1', 'us-east-2', 'us-west-2']
@@ -233,7 +234,7 @@ def deploy_handler(event):
     if shutdown_behaviour not in shutdown_behaviours:
         shutdown_behaviour = os.environ['SHUTDOWN_BEHAVIOUR']
 
-    if volume_size < 64 or volume_size > 256:
+    if volume_size < 64 or volume_size > 512:
         volume_size = 64
 
     selected_script = CONFIG_SCRIPT

gradle.properties

@@ -18,7 +18,7 @@ shutdownWait=15
 shutdownBehaviour=stop
 s3Backup=true
 maxRAM=140g
-#storageSize (in GiB) =  any number between 64 and 256. default 64
+#storageSize (in GiB) =  any number between 64 and 512. default 64
 storageSize=64
 region=us-east-2
 systemProp.org.gradle.internal.http.connectionTimeout=180000

src/main/bash/zipRootAndLastIterationAndUploadToS3.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-if [ "$#" -ne 2 ]; then
+if [ "$#" -ne 3 ]; then
     echo "Illegal number of parameters";
     exit 1;
 fi
@@ -11,5 +11,5 @@ zipfile="$filename-it.$2"
 zip -r "$zipfile.zip" $filename -x "$filename/ITERS/*"
 zip -ur "$zipfile.zip" $filename/ITERS/it.$2
 
-aws --region "us-east-2" s3 cp "$zipfile.zip" s3://beam-outputs/
-echo "S3 URL: https://s3.us-east-2.amazonaws.com/beam-outputs/$zipfile.zip";
+aws --region "us-east-2" s3 cp "$zipfile.zip" s3://$3/
+echo "S3 URL: https://s3.us-east-2.amazonaws.com/$3/$zipfile.zip"

src/main/scala/beam/agentsim/agents/choice/mode/ModeChoiceDriveIfAvailable.scala

@@ -1,13 +1,11 @@
 package beam.agentsim.agents.choice.mode
 
-import beam.agentsim.agents.household.HouseholdActor
 import beam.agentsim.agents.modalbehaviors.ModeChoiceCalculator
 import beam.router.Modes
 import beam.router.Modes.BeamMode.CAR
 import beam.router.model.EmbodiedBeamTrip
 import beam.sim.BeamServices
 import beam.sim.population.AttributesOfIndividual
-import org.matsim.api.core.v01.Id
 import org.matsim.api.core.v01.population.{Activity, Person}
 
 import scala.collection.mutable.ListBuffer

src/main/scala/beam/agentsim/agents/choice/mode/ModeChoiceLCCM.scala

@@ -271,7 +271,7 @@ class ModeChoiceLCCM(
     trips: ListBuffer[EmbodiedBeamTrip],
     person: Person,
     attributesOfIndividual: AttributesOfIndividual
-  ) = {
+  ): Double = {
     // Compute and log all-day score w.r.t. all modality styles
     // One of them has many suspicious-looking 0.0 values. Probably something which
     // should be minus infinity or exception instead.

src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala

@@ -21,17 +21,15 @@ import beam.router.BeamRouter._
 import beam.router.Modes
 import beam.router.Modes.BeamMode
 import beam.router.Modes.BeamMode._
-import beam.router.model.{BeamLeg, BeamPath, EmbodiedBeamLeg, EmbodiedBeamTrip}
+import beam.router.model.{BeamLeg, EmbodiedBeamLeg, EmbodiedBeamTrip}
 import beam.router.r5.R5RoutingWorker
 import beam.sim.population.AttributesOfIndividual
 import beam.utils.plan.sampling.AvailableModeUtils._
 import org.matsim.api.core.v01.population.{Activity, Leg}
 import org.matsim.api.core.v01.{Coord, Id}
-import org.matsim.core.population.routes.{NetworkRoute, RouteUtils}
+import org.matsim.core.population.routes.NetworkRoute
 import org.matsim.vehicles.Vehicle
 
-import scala.collection.JavaConverters._
-import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.duration._
 import scala.concurrent.{ExecutionContext, Future}
 
@@ -53,7 +51,7 @@ trait ChoosesMode {
 
   def bodyVehiclePersonId = VehiclePersonId(body.id, id, self)
 
-  def currentTourBeamVehicle =
+  def currentTourBeamVehicle: BeamVehicle =
     beamVehicles(stateData.asInstanceOf[ChoosesModeData].personData.currentTourPersonalVehicle.get)
       .asInstanceOf[ActualVehicle]
       .vehicle

src/main/scala/beam/agentsim/agents/modalbehaviors/ModeChoiceCalculator.scala

@@ -8,10 +8,8 @@ import beam.router.Modes.BeamMode._
 import beam.router.model.{EmbodiedBeamLeg, EmbodiedBeamTrip}
 import beam.sim.population.AttributesOfIndividual
 import beam.sim.{BeamServices, HasServices}
-import org.matsim.api.core.v01.population.Activity
-import org.matsim.api.core.v01.population.Person
+import org.matsim.api.core.v01.population.{Activity, Person}
 
-import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 import scala.util.Random
 
@@ -20,8 +18,6 @@ import scala.util.Random
   */
 trait ModeChoiceCalculator extends HasServices {
 
-  import ModeChoiceCalculator._
-
   implicit lazy val random: Random = new Random(
     beamServices.beamConfig.matsim.modules.global.randomSeed
   )

src/main/scala/beam/agentsim/agents/vehicles/BeamVehicleType.scala

@@ -89,17 +89,6 @@ object BeamVehicleType {
     automationLevel = 1
   )
 
-  val defaultBikeBeamVehicleType: BeamVehicleType = BeamVehicleType(
-    Id.create("BIKE-TYPE-DEFAULT", classOf[BeamVehicleType]),
-    2,
-    0,
-    1.5,
-    Gasoline,
-    defaultHumanBodyBeamVehicleType.primaryFuelConsumptionInJoulePerMeter / 5.0, // 5x more efficient than walking
-    defaultHumanBodyBeamVehicleType.primaryFuelCapacityInJoule, // same capacity as human body
-    vehicleCategory = Bike
-  )
-
   def isHumanVehicle(beamVehicleId: Id[Vehicle]): Boolean =
     beamVehicleId.toString.startsWith("body")
 

src/main/scala/beam/replanning/ReplanningUtil.scala

@@ -5,7 +5,6 @@ import org.matsim.api.core.v01.population._
 import org.matsim.core.config.groups.PlanCalcScoreConfigGroup
 import org.matsim.core.population.PopulationUtils
 import org.matsim.core.replanning.selectors.RandomPlanSelector
-import org.slf4j.LoggerFactory
 
 import scala.collection.JavaConverters._
 

src/main/scala/beam/utils/scenario/ScenarioLoader.scala

@@ -3,7 +3,7 @@ package beam.utils.scenario
 import java.util.Random
 
 import beam.agentsim.agents.vehicles.EnergyEconomyAttributes.Powertrain
-import beam.agentsim.agents.vehicles.{BeamVehicle, BeamVehicleType, VehicleCategory}
+import beam.agentsim.agents.vehicles.{BeamVehicle, VehicleCategory}
 import beam.router.Modes.BeamMode
 import beam.sim.BeamServices
 import beam.sim.vehicles.VehiclesAdjustment
@@ -148,13 +148,16 @@ class ScenarioLoader(
           )
           .toBuffer
 
-        vehicleTypes.append(
-          beamServices.vehicleTypes.values
-            .find(_.vehicleCategory == VehicleCategory.Bike)
-            .getOrElse(BeamVehicleType.defaultBikeBeamVehicleType)
-        )
+        beamServices.vehicleTypes.values
+          .find(_.vehicleCategory == VehicleCategory.Bike) match {
+          case Some(vehType) =>
+            vehicleTypes.append(vehType)
+          case None =>
+            throw new RuntimeException("Bike not found in vehicle types.")
+        }
         initialVehicleCounter += householdInfo.cars
         totalCarCount += vehicleTypes.count(_.vehicleCategory.toString == "Car")
+
         val vehicleIds = new java.util.ArrayList[Id[Vehicle]]
         vehicleTypes.foreach { beamVehicleType =>
           val vt = VehicleUtils.getFactory.createVehicleType(Id.create(beamVehicleType.id, classOf[VehicleType]))