SkimPlus & RepositioningManager #1585

haitamlaarabi · 2019-03-28T21:53:02Z

new skim data structure that should include additional information associated to every TAZ, such available vehicles by VehicleManager

Closes #1540

This change is

haitamlaarabi · 2019-03-28T21:55:48Z

test!

haitamlaarabi · 2019-03-28T22:03:55Z

test!

JustinPihony

One minor formatting item to take or leave :)

src/main/scala/beam/router/BeamSkimmer.scala

…d demand collected by the skimmer

…g-bis

haitamlaarabi · 2019-04-05T23:44:04Z

test!

haitamlaarabi · 2019-04-06T01:16:59Z

test!

…g-bis

JustinPihony · 2019-04-16T20:57:58Z

test!

JustinPihony · 2019-04-16T21:09:38Z

Is this still wanted. It went stale, so I'm not sure. If it is then I can fix the current compiler errors

…am into HL/#1540-rebalancing-bis

…g-bis

JustinPihony

Should this be pointing to master or dev? It seems like a heavy one to go straight to master

REASY · 2019-05-16T15:06:20Z

src/main/scala/beam/router/BeamSkimmer.scala

@@ -190,6 +196,16 @@ class BeamSkimmer @Inject()(val beamConfig: BeamConfig, val beamServices: BeamSe
    }
  }

+  def getPreviousSkimValueOrDefault(time: Int, mode: BeamMode, orig: Id[TAZ], dest: Id[TAZ]): Skim = {
+    previousSkims.get((timeToBin(time), mode, orig, dest)) match {
+      case someSkim @ Some(_) => someSkim.get.toSkimExternal


I think it can be rewritten like case Some(skim) => skim.toSkimExternal

REASY · 2019-05-16T15:08:02Z

src/main/scala/beam/router/BeamSkimmer.scala

+    label: Label,
+    who: Option[Id[Person]]
+  ): Unit = {
+    who match {


If you just need to do some side-effect on who in case it is Some, you could use foreach:

who.foreach { _ => val timeBin = timeToBin(time, timeWindow) val taz = beamServices.tazTreeMap.getTAZ(location.getX, location.getY) val key = (timeBin, taz.tazId, vehicleManager, label) skimsPlus.put(key, skimsPlus.getOrElse(key, 1.0) + 1.0) }

actually, I already removed the who from the parameters. I realized afterwards that I don't need it.

REASY · 2019-05-16T15:30:46Z

src/main/scala/beam/sim/vehiclesharing/AvailabilityBasedRepositioning.scala

+      var destTimeOpt: Option[(RepositioningRequest, Int)] = None
+      undersuppliedTAZ.foreach { dst =>
+        val skim = beamSkimmer.getPreviousSkimValueOrDefault(startTime, BeamMode.CAR, org.taz.tazId, dst.taz.tazId)
+        if (destTimeOpt.isEmpty || (destTimeOpt.isDefined && skim.time < destTimeOpt.get._2)) {


This could be rewritten like, but not sure that it looks better :D

destTimeOpt match { case None => destTimeOpt = Some((dst, skim.time)) case Some((_, time)) if skim.time < time => destTimeOpt = Some((dst, skim.time)) case _ => }

in this case I prefer the "if" since there are less line of codes

Just as an FYI, I don't think you gain much in allocation in the current mutable state, so maybe a foldLeft would be better overall?

oversuppliedTAZ.foreach{ org => undersuppliedTAZ.foldLeft(None: Option[(RepositioningRequest, Int)]){ case (destTimeOpt, dst) => val skim = beamSkimmer.getPreviousSkimValueOrDefault(startTime, BeamMode.CAR, org.taz.tazId, dst.taz.tazId) if(destTimeOpt.isEmpty) Some(dst, skim.time) else destTimeOpt.collect{ case destTime if skim.time > destTime._2 => Some((dst,skim.time))}.getOrElse(destTimeOpt) }.foreach{ case (dst, time) => ODs.append((org, dst, time))} }

REASY · 2019-05-16T15:33:01Z

src/main/scala/beam/sim/vehiclesharing/AvailabilityBasedRepositioning.scala

+          destTimeOpt = Some((dst, skim.time))
+        }
+      }
+      destTimeOpt match {


If just side-effect should happen, also could use destTimeOpt.foreach

REASY · 2019-05-16T15:35:16Z

src/main/scala/beam/sim/vehiclesharing/FixedNonReservingFleetManager.scala

-          log.debug("Checked out " + token.id)
-        case _ =>
-          who ! NotAvailable
+      println(s"to board ===> ${token.id}")


It is preferable to use logger.debug and adjust debug level for particular class

I have already removed all these println lines

REASY · 2019-05-16T15:40:25Z

src/main/scala/beam/sim/vehiclesharing/RepositionManagerListener.scala

+      RepositionManagerListener.writeRepositionEvents(event, eventsList)
+  }
+
+  val eventsList = mutable.ListBuffer.empty[(Int, Id[TAZ], Id[VehicleManager], Id[BeamVehicle], String, String)]


How many events will be here? Could it cause an issue (memory) on production run with a lot of vehicles? If it is stored only for the purpose of writing it in the end of iteration, it can be written during the simulation instead of accumulating all events

so this is the big change I did since yesterday. I got rid of the whole listener thing and rather used the skimmer with more or less same purpose

REASY · 2019-05-16T15:41:56Z

test/input/beamville/beam.conf

+    managerType = "fixed_non_reserving_fleet_from_file"
+    fixed_non_reserving_fleet_from_file {
+      vehicleTypeId = "PHEV",
+      filename = "/Users/haitam/workspace/beam/test/input/beamville/vehiclesShared.csv"


Please, make sure this path exist everywhere (maybe need to add it under sourcecontrol)

my bad didn't plan to push the conf file

REASY · 2019-05-16T15:42:00Z

test/input/beamville/beam.conf

-beam.warmStart.enabled = false
-beam.warmStart.path = "https://s3.us-east-2.amazonaws.com/beam-outputs/run149-base__2018-06-27_20-28-26_2a2e2bd3.zip"
+beam.warmStart.enabled = true
+beam.warmStart.path = "/Users/haitam/workspace/beam/output/beamville/beamville__2019-05-13_17-18-48/ITERS/it.0"


Please, make sure this path exist everywhere (maybe need to add it under sourcecontrol)

REASY · 2019-05-16T16:12:52Z

src/main/scala/beam/sim/vehiclesharing/AvailabilityBasedRepositioning.scala

+      mutable.TreeSet.empty[RepositioningRequest](Ordering.by[RepositioningRequest, Int](_.shortage))
+
+    beamServices.tazTreeMap.getTAZs.foreach { taz =>
+      if (relocate) {


Nothing happens in the loop if relocate is false, so it can be taken out of loop

okay I changed this code too

Changed to develop

…ng-bis

michaz · 2019-05-23T23:10:00Z

test!

SkimPlus added to BeamSkimmer

7ff573b

haitamlaarabi requested review from colinsheppard, REASY and wrashid March 28, 2019 21:53

ghost assigned haitamlaarabi Mar 28, 2019

ghost added the Review label Mar 28, 2019

fmt

b068aee

JustinPihony approved these changes Mar 30, 2019

View reviewed changes

src/main/scala/beam/router/BeamSkimmer.scala Outdated Show resolved Hide resolved

haitamlaarabi added 6 commits April 3, 2019 17:55

timer set up for relocation

74a2365

repositioning manager print every x seconds the available vehicles an…

554abea

…d demand collected by the skimmer

BeamSkimmer merge-conflict

539a759

Merge remote-tracking branch 'origin/master' into HL/#1540-rebalancin…

73b01e4

…g-bis

conflict-merge-fmt

90d6b7b

x => logger.info(x) to logger.info

8d5c057

haitamlaarabi changed the title ~~SkimPlus added to BeamSkimmer~~ SkimPlus & RepositioningManager Apr 5, 2019

haitamlaarabi added 2 commits April 5, 2019 17:42

fmt

79a3fd1

Merge branch 'master' into HL/#1540-rebalancing-bis

3a1e58d

haitamlaarabi and others added 3 commits April 15, 2019 16:30

first run ok

f963019

Merge remote-tracking branch 'origin/master' into HL/#1540-rebalancin…

0e7cbb6

…g-bis

Merge branch 'master' into HL/#1540-rebalancing-bis

18536bb

ghost assigned JustinPihony Apr 16, 2019

haitamlaarabi added 3 commits April 16, 2019 16:14

Merge branch 'HL/#1540-rebalancing-bis' of github.com:LBNL-UCB-STI/be…

a379a6d

…am into HL/#1540-rebalancing-bis

towrads generic reposition manager

2b94eb0

Merge remote-tracking branch 'origin/master' into HL/#1540-rebalancin…

80418ad

…g-bis

haitamlaarabi added 2 commits May 10, 2019 18:18

fixing skimplus bug

44a7672

reposition operational

7a8aaf0

JustinPihony previously requested changes May 15, 2019

View reviewed changes

REASY reviewed May 16, 2019

View reviewed changes

skimming relocation events instead of listening

6c21fa1

REASY approved these changes May 16, 2019

View reviewed changes

haitamlaarabi added 4 commits May 16, 2019 11:59

warm start in sflight 5k was poiting to a local file

2e12151

update list of oversupplied and undersupplied

1dfaeb3

pseudo reservation mechanism

fe03bcf

reposition validated on beamville

f29fa4c

JustinPihony changed the base branch from master to develop May 22, 2019 17:33

haitamlaarabi added 6 commits May 22, 2019 10:55

merge with develop part 1

db60bd3

Merge remote-tracking branch 'origin/develop' into HL/#1540-rebalanci…

f6df49f

…ng-bis

merge with develop p3 OK + not parked runtime exception

65b0928

random distribution within area

2ceee65

bad completion notice resolved

e3e9130

rolling back from pseudo reservation mechanism

e2bb19c

michaz merged commit 2387922 into develop May 24, 2019

michaz deleted the HL/#1540-rebalancing-bis branch May 24, 2019 00:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SkimPlus & RepositioningManager #1585

SkimPlus & RepositioningManager #1585

haitamlaarabi commented Mar 28, 2019 •

edited by JustinPihony

Loading

haitamlaarabi commented Mar 28, 2019

haitamlaarabi commented Mar 28, 2019

JustinPihony left a comment

haitamlaarabi commented Apr 5, 2019

haitamlaarabi commented Apr 6, 2019

JustinPihony commented Apr 16, 2019

JustinPihony commented Apr 16, 2019

JustinPihony left a comment

REASY May 16, 2019

haitamlaarabi May 16, 2019

REASY May 16, 2019 •

edited

Loading

haitamlaarabi May 16, 2019

REASY May 16, 2019 •

edited

Loading

haitamlaarabi May 16, 2019

JustinPihony May 19, 2019

REASY May 16, 2019

haitamlaarabi May 16, 2019

REASY May 16, 2019

haitamlaarabi May 16, 2019

REASY May 16, 2019

haitamlaarabi May 16, 2019

REASY May 16, 2019

haitamlaarabi May 16, 2019

REASY May 16, 2019

haitamlaarabi May 16, 2019

REASY May 16, 2019

haitamlaarabi May 16, 2019

michaz commented May 23, 2019

SkimPlus & RepositioningManager #1585

SkimPlus & RepositioningManager #1585

Conversation

haitamlaarabi commented Mar 28, 2019 • edited by JustinPihony Loading

haitamlaarabi commented Mar 28, 2019

haitamlaarabi commented Mar 28, 2019

JustinPihony left a comment

Choose a reason for hiding this comment

haitamlaarabi commented Apr 5, 2019

haitamlaarabi commented Apr 6, 2019

JustinPihony commented Apr 16, 2019

JustinPihony commented Apr 16, 2019

JustinPihony left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

REASY May 16, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

REASY May 16, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

michaz commented May 23, 2019

haitamlaarabi commented Mar 28, 2019 •

edited by JustinPihony

Loading

REASY May 16, 2019 •

edited

Loading

REASY May 16, 2019 •

edited

Loading