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 from base conf in production-sfbay #1116

Merged
merged 12 commits into from
Jan 7, 2019

Conversation

rajnikantsh
Copy link
Collaborator

@rajnikantsh rajnikantsh commented Jan 7, 2019

created new matsim conf and referred to base conf .


This change is Reviewable

rajnikantsh and others added 11 commits January 1, 2019 00:53
* 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 sf-light run

* fix comment
* 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
* 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
* 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
#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.
* decompose some code from RHM into new class to clear things a bit

* fmt

* clean
* 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
@ghost ghost assigned rajnikantsh Jan 7, 2019
@ghost ghost added the Review label Jan 7, 2019
Copy link
Contributor

@colinsheppard colinsheppard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

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

@colinsheppard colinsheppard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 47 of 47 files at r2.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @rajnikantsh)

@colinsheppard colinsheppard merged commit c5fa5e0 into production-sfbay Jan 7, 2019
@colinsheppard colinsheppard deleted the rajnikantsh/1115-extract-baseconf-4ci branch January 7, 2019 22:13
@ghost ghost removed the Review label Jan 7, 2019
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