Sync up with master: Part 1 #1712

REASY · 2019-04-18T21:05:19Z

This change is

REASY · 2019-04-18T21:07:23Z

test!

REASY · 2019-04-18T21:47:51Z

@carloscaldas, @JustinPihony
What do you think should be proper way to bring those changes back from master to develop? I've simply cherry-picked those commits from master which are not in develop (my changes) via git cherry origin/develop origin/master

colinsheppard

LGTM

REASY · 2019-04-19T16:09:42Z

test!

JustinPihony · 2019-04-19T16:12:31Z

@REASY I think cherry pick is a fine way to go

carloscaldas · 2019-04-19T21:54:04Z

@REASY one thing that I dislike in gitflow is that we cannot protect master branch (due to hotfixes) and cannot make sure a test ran before merging. Since the need happened cherry-pick is ok. But it is better to avoid merging in master unless is a hotfix.

carloscaldas · 2019-04-19T21:55:06Z

src/test/scala/beam/utils/osm/WayFixerTest.scala

+        val w = new Way()
+        w.addTag(WayFixer.LANES_TAG, "3");
+        WayFixer.fixLanes(1, w) shouldBe false
+        w.getTag(WayFixer.LANES_TAG) should be("3")


extract a method for those duplicate blocks of code

carloscaldas · 2019-04-19T21:55:33Z

src/main/scala/beam/utils/osm/WayFixer.scala

+//  private[osm] def getFixedSpeed(osmId: Long, way: Way): Option[Double] = {
+//    Option(way.getTag(MAXSPEED_TAG)) match {
+//      case Some(rawMaxSpeed) =>
+//        if (rawMaxSpeed.startsWith("[")) {


remove commented code

carloscaldas · 2019-04-19T21:56:39Z

src/main/java/beam/router/r5/R5MnetBuilder.java

        EdgeStore.Edge cursor = r5Network.streetLayer.edgeStore.getCursor();  // Iterator of edges in R5 network
        OsmToMATSim OTM = new OsmToMATSim(mNetwork, true);
+
+        int numberOfFixes = 0;
+        HashMap<String, Integer> highwayTypeToCounts = new HashMap<>();


Map<String, Integer> highwayTypeToCounts = new HashMap<>();

carloscaldas

Added comments and approve to not block

REASY · 2019-04-19T23:17:27Z

test!

JustinPihony · 2019-04-20T07:08:36Z

test!

REASY · 2019-04-20T20:45:38Z

test!

REASY · 2019-04-21T09:04:21Z

test!

REASY · 2019-04-21T13:22:18Z

test!

JustinPihony · 2019-04-21T21:53:01Z

The current build is failing because it is failing in master already...per b440293 Many tests are not set up for this injection - https://github.com/LBNL-UCB-STI/beam/blob/master/src/main/scala/beam/agentsim/agents/PersonAgent.scala#L220

JustinPihony · 2019-04-21T22:48:42Z

I'll put together a fuller PR when I get back to this (have to stop for now) - but here is a quick fix I did that works for the OtherPersonAgentSpec:

trait InjectableMock extends MockitoSugar {
  val injector  = mock[com.google.inject.Injector](withSettings().stubOnly())
  val config: BeamConfig
  val beamSvc: BeamServices
  private val x = new beam.router.TravelTimeObserved(config, beamSvc)
  when(injector.getInstance(classOf[beam.router.TravelTimeObserved])).thenReturn(x)
}

...

with InjectableMock

...

when(theServices.injector).thenReturn(injector)

Note that this is a bit of a circular reference, but solved by laziness...

REASY · 2019-04-23T17:21:19Z

test!

REASY · 2019-04-23T17:40:04Z

test!

REASY · 2019-04-23T18:37:22Z

test!

REASY · 2019-04-24T05:04:05Z

test!

REASY · 2019-04-24T12:57:33Z

test!

REASY · 2019-04-24T14:21:44Z

test!

…ty and freespeed - Added `WayFixer` to fix OSM data (highway type and lanes)

…on't make it worse :D) - `TravelTimeObserved` has it's own skimmer - TravelTimeObserved should use only `CAR` and `CAV`

JustinPihony · 2019-04-24T16:04:11Z

test!

* 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

REASY requested review from colinsheppard and wrashid April 18, 2019 21:05

ghost assigned REASY Apr 18, 2019

ghost added the Review label Apr 18, 2019

REASY requested review from carloscaldas and JustinPihony April 18, 2019 21:45

colinsheppard approved these changes Apr 18, 2019

View reviewed changes

JustinPihony approved these changes Apr 19, 2019

View reviewed changes

carloscaldas reviewed Apr 19, 2019

View reviewed changes

carloscaldas approved these changes Apr 19, 2019

View reviewed changes

ghost assigned JustinPihony Apr 20, 2019

REASY force-pushed the art/sync-up-with-master branch from 3307f2a to 5c6c082 Compare April 23, 2019 17:39

REASY and others added 15 commits April 24, 2019 21:47

- Fix links with the same fromNode and toNode: set length, capaci…

36e0c26

…ty and freespeed - Added `WayFixer` to fix OSM data (highway type and lanes)

Updated beam-utilities to v0.2.1

becc312

- injector is a field of BeamServices (it's already god object, w…

8b3db06

…on'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

383510e

Provide BeamSkimmer and TravelTimeObserved

1c1487b

Add all modes to excerpt skims

694da34

Prepare data in parallel

4cb5eb3

Fix TravelTimeObserved related tests

be48030

fmt

2f53bbe

Fix compilation for publicity and naming

427f63b

Fix trait due to circular pain

753a236

fmt

d62facb

Move to handle timing

7959f7c

Fixed broken tests

a6fee00

Done

e58f618

REASY force-pushed the art/sync-up-with-master branch from 150eef4 to e58f618 Compare April 24, 2019 14:47

JustinPihony merged commit 42d6e56 into develop Apr 24, 2019

ghost removed the Review label Apr 24, 2019

JustinPihony deleted the art/sync-up-with-master branch April 24, 2019 17:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync up with master: Part 1 #1712

Sync up with master: Part 1 #1712

REASY commented Apr 18, 2019 •

edited by colinsheppard

Loading

REASY commented Apr 18, 2019

REASY commented Apr 18, 2019 •

edited

Loading

colinsheppard left a comment

REASY commented Apr 19, 2019

JustinPihony commented Apr 19, 2019

carloscaldas commented Apr 19, 2019

carloscaldas Apr 19, 2019

carloscaldas Apr 19, 2019

carloscaldas Apr 19, 2019

carloscaldas left a comment

REASY commented Apr 19, 2019

JustinPihony commented Apr 20, 2019

REASY commented Apr 20, 2019

REASY commented Apr 21, 2019

REASY commented Apr 21, 2019

JustinPihony commented Apr 21, 2019

JustinPihony commented Apr 21, 2019

REASY commented Apr 23, 2019

REASY commented Apr 23, 2019

REASY commented Apr 23, 2019

REASY commented Apr 24, 2019

REASY commented Apr 24, 2019

REASY commented Apr 24, 2019

JustinPihony commented Apr 24, 2019

Sync up with master: Part 1 #1712

Sync up with master: Part 1 #1712

Conversation

REASY commented Apr 18, 2019 • edited by colinsheppard Loading

REASY commented Apr 18, 2019

REASY commented Apr 18, 2019 • edited Loading

colinsheppard left a comment

Choose a reason for hiding this comment

REASY commented Apr 19, 2019

JustinPihony commented Apr 19, 2019

carloscaldas commented Apr 19, 2019

carloscaldas Apr 19, 2019

Choose a reason for hiding this comment

carloscaldas Apr 19, 2019

Choose a reason for hiding this comment

carloscaldas Apr 19, 2019

Choose a reason for hiding this comment

carloscaldas left a comment

Choose a reason for hiding this comment

REASY commented Apr 19, 2019

JustinPihony commented Apr 20, 2019

REASY commented Apr 20, 2019

REASY commented Apr 21, 2019

REASY commented Apr 21, 2019

JustinPihony commented Apr 21, 2019

JustinPihony commented Apr 21, 2019

REASY commented Apr 23, 2019

REASY commented Apr 23, 2019

REASY commented Apr 23, 2019

REASY commented Apr 24, 2019

REASY commented Apr 24, 2019

REASY commented Apr 24, 2019

JustinPihony commented Apr 24, 2019

REASY commented Apr 18, 2019 •

edited by colinsheppard

Loading

REASY commented Apr 18, 2019 •

edited

Loading