Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

extract matsim properties from beam.conf to matsim.conf #1061

Merged
merged 11 commits into from
Jan 7, 2019

Conversation

rajnikantsh
Copy link
Collaborator

@rajnikantsh rajnikantsh commented Dec 18, 2018

Fixed #1008

This change is Reviewable

@ghost ghost assigned rajnikantsh Dec 18, 2018
@ghost ghost added the Review label Dec 18, 2018
@colinsheppard
Copy link
Contributor

We still need to create params for all of the typical and useful things we do in BEAM and then set them in the config object during runtime.

E.g. firstIter / lastIter
modules.strategy
physsim.network
etc.

@ghost ghost assigned colinsheppard Jan 2, 2019
@colinsheppard
Copy link
Contributor

@rajnikantsh Please look closely at the changes I made and then apply the same changes to all of the sf-light config files:

  • add the include for matsim.conf
  • add the beam parameters in the same place I put them in beam.conf

Please test and make sure that the model runs for all of the updated conf files.

Finally, please confirm for all of these parameters that the values are successfully communicated through to the BeamConfig class at runtime and not just taking on default values.

rajnikantsh and others added 4 commits January 3, 2019 22:26
…1008-extract-matsim-conf-4ci

# Conflicts:
#	test/input/sf-light/sf-light-1k.conf
extract matsim from sf-light and merge master
…1008-extract-matsim-conf-4ci

# Conflicts:
#	test/input/sf-light/sf-light-1k.conf
reset agent number in sf-light-2.5k
@colinsheppard
Copy link
Contributor

@rajnikantsh

I've renamed and repositioning many of the params in sf-light-1k.

You can copy these changes to all of the sf-light files but just duplicating from sf-light-1k and replacing 1k withe the appropriate value (and be sure to change beam.agentsim.numAgents to the appropriate value as well).

@colinsheppard colinsheppard merged commit 5af0277 into master Jan 7, 2019
@ghost ghost removed the Review label Jan 7, 2019
colinsheppard pushed a commit that referenced this pull request Jan 7, 2019
* add misc summary stats (#1085)

* add misc summary stats

* add null check and change return syntax

* refactoring

* bug fix: wrong field used

* refactor: reuse code

* add totalHoursOfVehicleTrafficDelay in summary stats.

* add summary stats for averagePTWaitingTime

* add bus crowding in summary stats

* reset bus crowding

* add averageTripExpenditure in summary stats

* fixed cost aggregation

* fixed PTCrowding (bus)

* renamed to totalNetCost

* fixed warnings

* reset ptWaiting against personId

* fixed average and update labels

* hoursTraveled should be renamed to travelDurationInSec, as this is not in hours

* remove / 3600 for busCrowding

* fixed hard coding of modes

* fixed hard coding of modes

* rename _person

* fixed warnings and format

* create summary stats for average vehicle delay for motorized leg. (#1095)

* fixed numOfTimesBusTaken in busCrowding

* changed buses list to set

* fixed averageVehicleDelay

* fixed delay stat variable name

* fixed delay stats calculation

* fix n/0 issue

* fix totalVehicles for averageDelays

* fix failing run for sf-light scenario  (#1097)

* fix sf-light run

* fix comment

* can give too much logging when vehicles misconfigured so make exponential

* Cs/#1099 rhm batch and repos (#1104)

* initial attempt to enable co-execution of these processes, still buggy

* debugging

* found bug related to new requests coming in while buffered requests being processed, more robust now

* fixing regression

* another glitch solved

* finally getting simultaneous timeouts working

* fmt

* allow pass when not in batch mode

* ignore failing test

* debug statements mistakently lefts as info

* summary stats modification (#1110)

* Merge remote-tracking branch 'remotes/origin/master' into rajnikantsh/#1008-extract-matsim-conf-4ci

# Conflicts:
#	test/input/sf-light/sf-light-1k.conf
add averageVehicleTravelPerPassengerTrip and averageTravelExpenditure for each activity

* changed variable name

* Cs/#1082 refine analysis (#1109)

* turns into case objects, change delay metric bins

* change delay metric plot  (#1083)

* change plot for delay metric

* Scala fmt

* resolved average delay graph issue

* more descriptive titles

* space

* debugging non-deterministic stuck issue

* fmt

* repairing the fallback BeamPath used for transit trips that can't be … (#1106)

* repairing the fallback BeamPath used for transit trips that can't be routed to avoid exceptions later on

(cherry picked from commit 2cd4bdc)

* scalafmt

* ignore flaky test.

* Cs/#1100 Refactor (#1113)

* decompose some code from RHM into new class to clear things a bit

* fmt

* clean

* extract matsim properties from beam.conf to matsim.conf (#1061)

* extract matsim properties from beam.conf to matsim.conf

* fmt

* set param in beam config and referred in matsim config

* renaming and moving

* better default for iters

* remaining changes in extracting matsim config

* Merge remote-tracking branch 'remotes/origin/master' into rajnikantsh/#1008-extract-matsim-conf-4ci

# Conflicts:
#	test/input/sf-light/sf-light-1k.conf
reset agent number in sf-light-2.5k

* renaming and reogranizing params

* renaming and repositioning of sf-light

* fmt

* extract matsim from base conf

* Merge branch 'master' into rajnikantsh/1115-extract-baseconf-4ci
@JustinPihony JustinPihony deleted the rajnikantsh/#1008-extract-matsim-conf-4ci branch January 9, 2019 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants