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

fix bug 329 part 1 for services #332

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fix bug 329 part 1 for services #332

wants to merge 9 commits into from

Commits on Nov 29, 2016

  1. Merge pull request #1 from jie31best/bugfix/bug-280 

    fix bug 280
    @jie31best
    jie31best authored Nov 29, 2016
    Configuration menu
    Copy the full SHA
    ba97ba9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from jie31best/bugfix/delivershipment-max-dista… 

    …nce-constraint

fix deliverShipment insertion in max distance constraint
    @jie31best
    jie31best authored Nov 29, 2016
    Configuration menu
    Copy the full SHA
    278a0d2 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2017

  1. Merge the changes from upstream/master into local master branch.

    @huangheNV
    huangheNV committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    94dfc94 View commit details
    Browse the repository at this point in the history

  2. fix #329 part 1: 

    handle properly the case when 1) the vehicle has a break; 2) the route end time is after the break time window; and 3) the break cannot be inserted into the route.
for services.
    @huangheNV
    huangheNV committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    7bf3f56 View commit details
    Browse the repository at this point in the history

  3. Merge commit '562be55ae6fc5820449561cb17c3a310ea2c76a5'

    @huangheNV
    huangheNV committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    82e00c4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bugfix/bug-329'

    @huangheNV
    huangheNV committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    2e3e852 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2017

  1. Merge commit '562be55ae6fc5820449561cb17c3a310ea2c76a5' into bugfix/b… 

    …ug-329

# Conflicts:
#	jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java
    @huangheNV
    huangheNV committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    2bc9a23 View commit details
    Browse the repository at this point in the history

  2. for shipments

    @huangheNV
    huangheNV committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    d1ff36f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'bugfix/bug-329'

    @huangheNV
    huangheNV committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    dc7b8cd View commit details
    Browse the repository at this point in the history