-
Notifications
You must be signed in to change notification settings - Fork 57
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
Changes to bring back to develop because they were pushed directly to production-sfbay-develop-debug #2205
Conversation
…oduction-sfbay-develop` (and not in `develop` too)
@@ -124,7 +124,7 @@ private Double getCategory(double time, List<Double> categories) { | |||
|
|||
private static final String graphTitle = "Ride Hail Waiting Histogram"; | |||
private static final String xAxisTitle = "Hour"; | |||
private static final String yAxisTitle = "Count"; | |||
private static final String yAxisTitle = "Waiting Time (frequencies)"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please change this axis label to "Frequency binned by Waiting Time"
Approved though made one small request about the change to the plot label...
…On Thu, Oct 3, 2019 at 7:14 AM REASY ***@***.***> wrote:
@REASY <https://github.com/REASY> requested your review on: #2205
<#2205> Changes to bring back to
develop because they were pushed directly to production-sfbay-develop-debug.
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub
<#2205?email_source=notifications&email_token=AACRLFSEIAPD2XHAOOHLDB3QMX45DA5CNFSM4I5DWGO2YY3PNVWWK3TUL52HS4DFWZEXG43VMVCXMZLOORHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZGOT766OEA#event-2684217104>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AACRLFR3XHTSZV6DMZN22GTQMX45DANCNFSM4I5DWGOQ>
.
|
test! |
Test! |
test! |
For posterity since the build might get overwritten:
|
@colinsheppard the change https://github.com/LBNL-UCB-STI/beam/pull/2205/files#diff-e1f29a69747e6477eba9e402dc9cc960R452 breaks |
* Add bike_transit * Add bike_transit on other places * Merge branch 'develop' into rajnikantsh/#1915-addBikeTransit-4ci * Add bike_transit intercept * change bike_transit mode as per drive transit * Merge branch 'develop' into rajnikantsh/#1915-addBikeTransit-4ci * add bike_transit in calibration file * warmstart test * Reused code from FileUtils * Merge branch 'develop' into rajnikantsh/#1950-warmStart-test-4ci * Merge branch 'develop' into rajnikantsh/#1950-warmStart-test-4ci * add new files for warm start * Merge branch 'develop' into rajnikantsh/#1950-warmStart-test-4ci * scale utilities in mode choice * Merge remote-tracking branch 'origin/develop' into zn/scale-utilites-for-mode-choice * change bin size to 6 in relative speed * adjust test cases * Change graph yaxis label * prioritize taking vehicles from people with short commutes * fmt * clean up * fmt * handle bad coords * more logging * more logging, improve speed hopefully * further speedup * mutable map of arraybuffers * start collecting person score * more general scoring * simplify, add penalty for early and late trips * revert files accidentally changed * reduce early trip penalty * bug * Merge remote-tracking branch 'origin/develop' into zn/vehicle-retirement * print vehicle type id * Merge pull request #2180 from LBNL-UCB-STI/zn/#2179-refuelsessionevent-vehicle-id #2179 print vehicle type id in refuelsessionevent * make bushwhack trips normal walk speed, minkowski dist * fmt * scala fmt * Merge pull request #2181 from LBNL-UCB-STI/zn/bushwhack-speed-distance make bushwhack trips normal walk speed, minkowski dist * Merge pull request #2176 from LBNL-UCB-STI/zn/vehicle-retirement Consider commute in whether to retire household vehicles * data to enable scenarios with RH EVs that charge * update protocol so RHA drives to the charger... for now force it to happen even if distance is close... maybe will change later * more tweaks to data to test out RH EV humans * track vehicle location and use it to make trip to charger correct, then adjust parking stall sampler to be more appropriate * merge * fmt * make the location snap to TAZ more quickly * Merge branch 'develop' into rajnikantsh/#2143-add-bin-in-relativeNetwork-4ci * skeleton for agent trip script * Do not do manual GC (#2189) * Generate trip table * - Changed `interruptId` to be Int - Added `InterruptIdIdGenerator` to generate monotonically increasing ids for interrupts * Merge pull request #2191 from LBNL-UCB-STI/art/replace-interrupt-id-by-int-4ci Use InterruptIdIdGenerator to generate interrupt ids * fmt * subtract fuel cost from trip cost within RHM, also fix divide by zero issue in PoolingInfo * fmt * Use ReservationRequestIdGenerator to generate requestId for reservation #2191 (#2195) * - Added `ReservationRequestIdGenerator` - `ReservationRequest.requestId` is an integer and it uses `ReservationRequestIdGenerator` * Sync-up test class name with actor name * ridehail revenue fix * merge * Merge pull request #2194 from LBNL-UCB-STI/cs/#2192-remove-fuel-cost-from-rh-fare Cs/#2192 remove fuel cost from rh fare * Merge pull request #2185 from LBNL-UCB-STI/cs/rh-human-should-drive-to-charge Cs/rh human should drive to charge * Make sure arrays are order by hour * Merge pull request #2166 from LBNL-UCB-STI/rajnikantsh/#2136-change-yaxis_label-4ci Change graph yaxis label * adding debug template * Merge pull request #2199 from LBNL-UCB-STI/art/make-sure-arrays-are-sorted-by-hours-4ci Make sure arrays are order by hour * script added * Add Repositioning Analysis * Add CSV events files * Scala fmt * set requestBufferTimeoutInSeconds = 0 * heat_map/heatmap.py -> smaprt/mep/build_heatmap.py * typo fixed * Merge pull request #2201 from LBNL-UCB-STI/inm/script-for-draw-heatmap inm/python script to draw a heatmap * Changes which are in `production-sfbay-develop-debug`, but not in `production-sfbay-develop` (and not in `develop` too) * change mode to only ride_hail * Update RideHailWaitingAnalysis.java * Make sure what is in AWS is what is in git (#2198) * Bump to 2.12.9 (#2158) * Bump to 2.12.9 * 10 is out now * Fix warning in new scala version * Merge * fmt * Refactoring - remove warnings and simplify code (#2144) * replace type check with pattern matching * use named arguments * use named arguments * removed redundant parenthesis * removed unused import * removed unused imports * added name arguments * fixed typo * Merge branch 'develop' into rajnikantsh/#1950-warmStart-test-4ci * Merge pull request #2161 from LBNL-UCB-STI/rajnikantsh/#2143-add-bin-in-relativeNetwork-4ci change bin size to 6 in relative speed * change PathTraversalEvent.apply instead of csv reading * Merge remote-tracking branch 'remotes/origin/develop' into rw/#2187-trip-table * fmt * Merge remote-tracking branch 'remotes/origin/develop' into rajnikantsh/#1915-addBikeTransit-4ci # Conflicts: # src/main/scala/beam/agentsim/agents/choice/mode/ModeChoiceMultinomialLogit.scala * Merge pull request #2146 from LBNL-UCB-STI/zn/scale-utilites-for-mode-choice scale utilities in mode choice * change file formats * change file format * Merge remote-tracking branch 'remotes/origin/develop' into rajnikantsh/#1915-addBikeTransit-4ci * set requestBufferTimeoutInSeconds to 0 * Merge pull request #2205 from LBNL-UCB-STI/art/what-is-left-to-merge-to-develop-4ci Changes to bring back to develop because they were pushed directly to production-sfbay-develop-debug * Add bike_transit test case * Merge remote-tracking branch 'remotes/origin/develop' into rajnikantsh/#1915-addBikeTransit-4ci # Conflicts: # src/main/resources/beam-template.conf * resolve conflicts * fmt * Do not expect actor to be terminated (#2210) * Merge pull request #2203 from LBNL-UCB-STI/rajnikantsh/repositioning-analysis-4ci Add Repositioning Analysis * Merge pull request #1960 from LBNL-UCB-STI/rajnikantsh/#1950-warmStart-test-4ci beam warmstart test * Remove unnecessary code * Merge pull request #2207 from LBNL-UCB-STI/rw/#2187-trip-table Rw/#2187 trip table * Merge branch 'develop' into rajnikantsh/#1915-addBikeTransit-4ci * fix warmstart test error * Merge pull request #2212 from LBNL-UCB-STI/rajnikantsh/fix-warmstart-error-4ci fix warmstart test error * Stagger initial tick for repositioning (#2214) * Stagger repositioning * Initial tick for repositioning does not overlap with allocationManager init tick * Merge pull request #1918 from LBNL-UCB-STI/rajnikantsh/#1915-addBikeTransit-4ci Add bike_transit * When remove `RideHailAgentLocation` from Spatial index compare only `vehicleId` as the cheapest field. This solves the problem of having multiple `RideHailAgentLocation` for the single `vehicleId` in spatial index * Merge pull request #2219 from LBNL-UCB-STI/art/investigate-degradation-when-high-rhm-intercept-4ci Fix the grow of idleRideHailAgentSpatialIndex * Cover by unit test the behaviour of spatial index for `RideHailAgentLocation` (#2221) * Merge branch 'develop' into competitions-pin_dev_merge
Changes which are in
production-sfbay-develop-debug
, but not inpr…oduction-sfbay-develop
(and not indevelop
too)This change is