Use vehicles.csv input in UrbanSim scenarios

[zneedell]

Previously the scenario's PrivateVehicles attribute was being overwritten during scenarioAdjustment when we're using an urbansim scenario (as is the case during pilates). Here's a trial fix, with a hack to hopefully not break anything when freight is turned on

---

This change is 

[haitamlaarabi]

Reviewed all commit messages.
Reviewable status: 0 of 11 files reviewed, 3 unresolved discussions (waiting on @zneedell)

---

src/main/scala/beam/agentsim/agents/Population.scala line 109 at r1 (raw file):

            VehicleInfo(
              vehicleId = "",
              vehicleTypeId = vehId.toString,

Is this supposed to be vehicleTypeId or vehicleId?

---

src/main/scala/beam/sim/BeamHelper.scala line 325 at r1 (raw file):

    val (privateVehicleMap, privateVehicleSoc) = beamConfig.beam.exchange.scenario.source.toLowerCase match {
      // when reading an urbansim scenario, we read in the vehicles again in ScenarioAdjustment, so there's no need to
      // bother reading it in now. For now we still do read in freight vehicles, although it's probably cleaner to move

@dimaopen @nikolayilyin can you actually address this, if possible?

---

src/main/scala/beam/utils/scenario/UrbanSimScenarioLoader.scala line 60 at r1 (raw file):

  def loadScenario(): (Scenario, Boolean) = {
    // This is a hack for now. When initially building the scenario we skip reading personal vehicles but do read

@dimaopen @nikolayilyin and this

[zneedell]

src/main/scala/beam/agentsim/agents/Population.scala line 109 at r1 (raw file):

Previously, haitamlaarabi (Haitam Laarabi) wrote…

Is this supposed to be vehicleTypeId or vehicleId?

Ah good catch, thanks!

[zneedell]

Test now!

[zneedell]

Test now!

[nikolayilyin]

test now!

[nikolayilyin]

test now!

[zneedell]

Test now!