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.

Sign up for GitHub

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

Jump to bottom

SkimPlus & RepositioningManager #1585

Merged
merged 33 commits into from
May 24, 2019
Merged

SkimPlus & RepositioningManager #1585

merged 33 commits into from
May 24, 2019

Commits on Mar 28, 2019

  1. SkimPlus added to BeamSkimmer

    @haitamlaarabi
    haitamlaarabi committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    7ff573b View commit details
    Browse the repository at this point in the history

  2. fmt

    @haitamlaarabi
    haitamlaarabi committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    b068aee View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. timer set up for relocation

    @haitamlaarabi
    haitamlaarabi committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    74a2365 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2019

  1. repositioning manager print every x seconds the available vehicles an… 

    …d demand collected by the skimmer
    @haitamlaarabi
    haitamlaarabi committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    554abea View commit details
    Browse the repository at this point in the history

  2. BeamSkimmer merge-conflict

    @haitamlaarabi
    haitamlaarabi committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    539a759 View commit details
    Browse the repository at this point in the history

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

    …g-bis
    @haitamlaarabi
    haitamlaarabi committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    73b01e4 View commit details
    Browse the repository at this point in the history

  4. conflict-merge-fmt

    @haitamlaarabi
    haitamlaarabi committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    90d6b7b View commit details
    Browse the repository at this point in the history

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

    @haitamlaarabi
    haitamlaarabi committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    8d5c057 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2019

  1. fmt

    @haitamlaarabi
    haitamlaarabi committed Apr 6, 2019
    Configuration menu
    Copy the full SHA
    79a3fd1 View commit details
    Browse the repository at this point in the history

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

    @haitamlaarabi
    haitamlaarabi authored Apr 6, 2019
    Configuration menu
    Copy the full SHA
    3a1e58d View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2019

  1. first run ok

    @haitamlaarabi
    haitamlaarabi committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    f963019 View commit details
    Browse the repository at this point in the history

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

    …g-bis
    @haitamlaarabi
    haitamlaarabi committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    0e7cbb6 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

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

    @JustinPihony
    JustinPihony authored Apr 16, 2019
    Configuration menu
    Copy the full SHA
    18536bb View commit details
    Browse the repository at this point in the history

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

    …am into HL/#1540-rebalancing-bis
    @haitamlaarabi
    haitamlaarabi committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    a379a6d View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2019

  1. towrads generic reposition manager

    @haitamlaarabi
    haitamlaarabi committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    2b94eb0 View commit details
    Browse the repository at this point in the history

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

    …g-bis
    @haitamlaarabi
    haitamlaarabi committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    80418ad View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2019

  1. WIP a much better design but vehiclesForReposition always empty, I ne… 

    …ed to figure out why
    @haitamlaarabi
    haitamlaarabi committed Apr 20, 2019
    Configuration menu
    Copy the full SHA
    22d9868 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2019

  1. adding reposition listener

    @haitamlaarabi
    haitamlaarabi committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    b81fb81 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2019

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

    @JustinPihony
    JustinPihony authored Apr 24, 2019
    Configuration menu
    Copy the full SHA
    474144a View commit details
    Browse the repository at this point in the history

  2. fmt

    @JustinPihony
    JustinPihony committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    1ec2c8a View commit details
    Browse the repository at this point in the history

Commits on May 11, 2019

  1. fixing skimplus bug

    @haitamlaarabi
    haitamlaarabi committed May 11, 2019
    Configuration menu
    Copy the full SHA
    44a7672 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2019

  1. reposition operational

    @haitamlaarabi
    haitamlaarabi committed May 14, 2019
    Configuration menu
    Copy the full SHA
    7a8aaf0 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2019

  1. skimming relocation events instead of listening

    @haitamlaarabi
    haitamlaarabi committed May 16, 2019
    Configuration menu
    Copy the full SHA
    6c21fa1 View commit details
    Browse the repository at this point in the history

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

    @haitamlaarabi
    haitamlaarabi committed May 16, 2019
    Configuration menu
    Copy the full SHA
    2e12151 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2019

  1. update list of oversupplied and undersupplied

    @haitamlaarabi
    haitamlaarabi committed May 17, 2019
    Configuration menu
    Copy the full SHA
    1dfaeb3 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

  1. pseudo reservation mechanism

    @haitamlaarabi
    haitamlaarabi committed May 21, 2019
    Configuration menu
    Copy the full SHA
    fe03bcf View commit details
    Browse the repository at this point in the history

Commits on May 22, 2019

  1. reposition validated on beamville

    @haitamlaarabi
    haitamlaarabi committed May 22, 2019
    Configuration menu
    Copy the full SHA
    f29fa4c View commit details
    Browse the repository at this point in the history

  2. merge with develop part 1

    @haitamlaarabi
    haitamlaarabi committed May 22, 2019
    Configuration menu
    Copy the full SHA
    db60bd3 View commit details
    Browse the repository at this point in the history

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

    …ng-bis
    @haitamlaarabi
    haitamlaarabi committed May 22, 2019
    Configuration menu
    Copy the full SHA
    f6df49f View commit details
    Browse the repository at this point in the history

  4. merge with develop p3 OK + not parked runtime exception

    @haitamlaarabi
    haitamlaarabi committed May 22, 2019
    Configuration menu
    Copy the full SHA
    65b0928 View commit details
    Browse the repository at this point in the history

  5. random distribution within area

    @haitamlaarabi
    haitamlaarabi committed May 22, 2019
    Configuration menu
    Copy the full SHA
    2ceee65 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2019

  1. bad completion notice resolved

    @haitamlaarabi
    haitamlaarabi committed May 23, 2019
    Configuration menu
    Copy the full SHA
    e3e9130 View commit details
    Browse the repository at this point in the history

  2. rolling back from pseudo reservation mechanism

    @haitamlaarabi
    haitamlaarabi committed May 23, 2019
    Configuration menu
    Copy the full SHA
    e2bb19c View commit details
    Browse the repository at this point in the history