Merge master into develop #1816
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use `R5` from `com.github.LBNL-UCB-STI`
…ty and freespeed - Added `WayFixer` to fix OSM data (highway type and lanes)
throw exception if bike is missing in vehicle types and remove default bike
Adjust speeds, highways and other things
…on't make it worse :D) - `TravelTimeObserved` has it's own skimmer - TravelTimeObserved should use only `CAR` and `CAV`
…clude-only-car-travel-time-4ci Scatter plot should include only car travel time
Log number of times when min speed has been used during the iteration
Fix TravelTimeObserved related tests
…pt-2 SimRunnerForTest: Provide TravelTimeObserved for SimRunnerForTest
…s-4ci Include all modes in excerpt skims
* fixed beam sim lambda merge issues * updated upper bound of storage size to 512 (based on rashid's feedback)
Fix zip iteration script
* od skimm scatter plot * add legend to scatter plot * put values in buckets for color clustering * fix formatting for TravelTimeObserved * change how buckets work for TravelTimeObserved * sort buckets for TravelTimeObserved * fix formatting * fix shape of the dots * fix formatting of TravelTimeObserved * - Added hashCode (#1675) - Changed the order to make sure light operation happens at first * Use `R5` from `com.github.LBNL-UCB-STI` * Events: Added linkTravelTime to attributes of PathTraversalEvent (#1671) * Added `linkTravelTime` to attributes of `PathTraversalEvent` * Make sure it is backward compatible * fix: Motorized vehicle miles traveled should not includes walk (#1704) * Add slack notification for beam deployments (#1718) * Removed redundant map * Removed unused imports * Simplified expression and removed warning * Removed warning: unnecessary parenthesis * Removed warning: replaced map.get(key).get with map(key) * Removed warning: added type annotation to unit method * Removed warning: simplified expression * Removed two warnings: replace.size>0 with nonEmpty * Removed warnings: named parameters * remove redundant jar * scala fmt * set write matsim network to true by default * add logs to beam skimmer * new histogram for all roads * log activities with non-negative end times * Sync up with master: Part 1 (#1712) * - Fix links with the same `fromNode` and `toNode`: set length, capacity and freespeed - Added `WayFixer` to fix OSM data (highway type and lanes) * Updated `beam-utilities` to `v0.2.1` * - `injector` is a field of `BeamServices` (it's already god object, won't make it worse :D) - `TravelTimeObserved` has it's own skimmer - TravelTimeObserved should use only `CAR` and `CAV` * Log number of times when min speed has been used during the iteration * Fix TravelTimeObserved related tests * fmt * Fix compilation for publicity and naming * Add all modes to excerpt skims * Fix trait due to circular pain * fmt * Prepare data in parallel * Provide `BeamSkimmer` and `TravelTimeObserved` * Done * Move to handle timing * Fixed broken tests * Fixed `Can' t connect to X11 window server using 'localhost:10.0' as the value of the DISPLAY variable` * Changed HouseHoldInfo.cars from Double to Int (#1747) * Use 2-d array to represent travel time (#1716) * - File appender is described in `logback.xml`. Path is injected via property (#1657) - Simplified `logback.xml` * Write csv and plot to compare euclidean vs. length attribute plot Write csv and plot to compare euclidean vs. length attribute plot for matsim network #1697 * R5RoutingApp to be able to make routing request via HTTP Post request (#1670) * R5RoutingApp to be able to make routing request via HTTP Post request * Make sure warm-start is taken into account * Extract formats to `beam.utils.json` package to be able to reuse them * fix exclusion syntax for all iterations * histogram to check link length distributions within the network * - Safe previously created attributes (#1755) - Memory optimization for XML event writer - Do not allocate extra HashSet, map already contains keys as Set `keySet` * add linkId column to writeComparisonEuclideanVsLengthAttributeCsv * Removed startup message duplication * Removed warning enclosing block is redundant * Removed warning - shadowing pattern * Minor improvements for `getClosestIdleVehiclesWithinRadiusByETA` - do not sort, just use `min` (#1758) * publish changes made to beam config during run time ,to all references using observable design pattern * NetworkXmlToCSV.scala: Ability to run (#1775) * - Added `main` method - Ability to read compressed XML (.xml.gz) * Make sure comma is escaped * convert physsim event xml to csv * reset configfilelocations system property on shutdown * add beam scoring function factory and hao2018 as observers * Escape comma for the mergeOutput too * Avoid scenario loaded twice 4ci (#1766) * Added test for BeamSkimmer CSV read/write and small refactoring (#1784) * fixed conversion from double as string to int (#1785) * add AgentSimtoPhysSimPlanConvertor as beam config change observer * add BeamScoringFunctionFactory as beam config change observer * listen to beam config changes in notify iteration ends inside beam sim * format code * Project: Split logback to dev (original one) and prod (#1763) * - Added `src/main/resources` to resources - Added `logback_prod.xml` for PROD - Set `logback.xml` in `RunBeam` if it is not set - Added `log-path_IS_UNDEFINED` to gitignore * Added new line * Fixed PR review * inject current beam config instance whenever the config path is not found * Fix Warm start routing Spec * remove unwanted Test class used for debugging
|
First, let's see if master has errors... |
|
No, looks good. |
This reverts commit 1c6aa89.
…-master-u1-4ci Revert "Merge develop to master"
…er-3 Merge develope to master
REASY
approved these changes
May 19, 2019
|
test! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change is