Skip to content

Add support for Vroom 1.11.0 #25

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

Merged
krashish8 merged 45 commits into from
Dec 6, 2021
Merged

Add support for Vroom 1.11.0 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
43f769d
[vroom][ci] Added caching for VROOM
krashish8 Dec 2, 2021
c24bd15
[vroom][ci] Change VROOM version to 1.11.0
krashish8 Dec 2, 2021
db8bf85
[vroom][build] Change VROOM version to 1.11.0
krashish8 Dec 2, 2021
f806172
[vroom][doc] Change VROOM version to 1.11.0
krashish8 Dec 2, 2021
f18700d
[vroom][src] Add setup time in jobs and shipments
krashish8 Dec 2, 2021
78229d4
[vroom][include] Add setup time in jobs and shipments
krashish8 Dec 2, 2021
f711091
[vroom][doc] Add setup time in jobs and shipments
krashish8 Dec 2, 2021
0cee415
[vroom][src] Add support for custom cost matrices
krashish8 Dec 2, 2021
90e396b
[vroom][include] Add support for custom cost matrices
krashish8 Dec 2, 2021
1b8b15e
[vroom] Update vroom data for custom cost matrices
krashish8 Dec 2, 2021
8ec8e2c
[vroom][doc] Add support for custom cost matrices
krashish8 Dec 2, 2021
d5e5b08
[vroom][docquery] Update docqueries for custom cost matrices
krashish8 Dec 2, 2021
0affcc2
[vroom][pgtap] Update tests for custom cost matrices
krashish8 Dec 2, 2021
c97156d
[vroom] Add Gehring & Homberger benchmark data for 1000 jobs
krashish8 Dec 4, 2021
3c98ec1
[vroom][sql] Add timeout and exploration_level parameters
krashish8 Dec 4, 2021
b1f0a87
[vroom][src] Add timeout and exploration_level parameters
krashish8 Dec 4, 2021
0915c68
[vroom] Honor client cancel requests
krashish8 Dec 4, 2021
7514081
[vroom][include] Add timeout and exploration_level parameters
krashish8 Dec 4, 2021
b304579
[vroom][pgtap] Add tests for timeout and exploration_level
krashish8 Dec 4, 2021
4ff35ab
[vroom][doc] Update documentation for timeout and exploration_level p…
krashish8 Dec 4, 2021
9e5bc24
[vroom] Change exploration_level from SMALLINT to INTEGER
krashish8 Dec 6, 2021
7a8a26b
[vroom][src] Add max_tasks column in vehicles
krashish8 Dec 4, 2021
b4c082a
[vroom][include] Add max_tasks column in vehicles
krashish8 Dec 4, 2021
39f7bfc
[vroom][tools] Update vroomdata with max_tasks vehicle column
krashish8 Dec 4, 2021
cee9a9a
[vroom][pgtap] Add tests for max_tasks vehicle column
krashish8 Dec 4, 2021
516a2a7
[vroom][pgtap] Add tests for empty skills arrays
krashish8 Dec 4, 2021
42e52d3
[vroom][src] Add custom scaling logic for speed factor
krashish8 Dec 4, 2021
6fc4fc9
[vroom][include] Add custom scaling logic for speed factor
krashish8 Dec 4, 2021
2b5722d
[vroom][pgtap] Add tests for speed factor
krashish8 Dec 4, 2021
9725e02
[vroom] Fix clang errors
krashish8 Dec 4, 2021
bb4521c
[vroom][tools] Ignoring any signature changes made on v0
krashish8 Dec 4, 2021
38fd5fe
[vroom][pgtap] Change function version in pgTAP tests to 0.3.0
krashish8 Dec 6, 2021
e37b3ca
[vroom][doc] Refine the documentation - separate INTEGER and TIMESTAM…
krashish8 Dec 6, 2021
79d9455
[vroom][sql] Refine the documentation - separate INTEGER and TIMESTAM…
krashish8 Dec 6, 2021
0e994c8
[vroom][src] Documentation: Add default values for all the columns
krashish8 Dec 6, 2021
f4be28f
[vroom][sql] Modify parameter names: index->id
krashish8 Dec 6, 2021
25b5874
[vroom][src] Modify parameter names: index->id
krashish8 Dec 6, 2021
c6873e6
[vroom][include] Modify parameter names: index->id
krashish8 Dec 6, 2021
96de447
[vroom][tools] Modify parameter names: index->id
krashish8 Dec 6, 2021
c7f7b5d
[vroom][pgtap] Modify parameter names: index->id
krashish8 Dec 6, 2021
0be0931
[vroom][docqueries] Modify parameter names: index->id
krashish8 Dec 6, 2021
14a4699
[cmake] Update vrpRouting documentation link
krashish8 Dec 6, 2021
69ba904
[vroom][doc] Update installation instructions
krashish8 Dec 6, 2021
d42e4c3
[vroom] Update README with VROOM installation link
krashish8 Dec 6, 2021
ad33d1e
Update NEWS and release_notes
krashish8 Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions .github/workflows/boost_version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()')
echo "PGVER=${pgver}" >> $GITHUB_ENV
echo "PGIS=3" >> $GITHUB_ENV
echo "VROOMVER=1.11.0" >> $GITHUB_ENV

- name: Add PostgreSQL APT repository
run: |
Expand Down Expand Up @@ -66,25 +67,35 @@ jobs:
run: |
sudo apt-get install libssl-dev libasio-dev libglpk-dev

- name: Build VROOM v1.10.0
- name: Cache VROOM
id: cache-vroom
uses: actions/cache@v2
env:
cache-name: vroom
with:
path: |
~/vroom-${{ env.VROOMVER }}
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}

- name: Build VROOM
if: steps.cache-vroom.outputs.cache-hit != 'true'
run: |
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
tar -zvxf v1.10.0.tar.gz
cd vroom-1.10.0/src
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
cd ~/vroom-${{ env.VROOMVER }}/src

# Create object file with position independent code using -fPIC flag
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile

cd ~/vroom-${{ env.VROOMVER }}/src
make
cd ..
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV

- name: Configure
run: |
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
mkdir build
cd build
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DWITH_DOC=OFF -DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DWITH_DOC=OFF -DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..

- name: Build
run: |
Expand Down
25 changes: 18 additions & 7 deletions .github/workflows/check-queries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
echo "PGVER=${PGVER}" >> $GITHUB_ENV
echo "PGPORT=5432" >> $GITHUB_ENV
echo "PGIS=3" >> $GITHUB_ENV
echo "VROOMVER=1.11.0" >> $GITHUB_ENV

- name: Add PostgreSQL APT repository
run: |
Expand All @@ -56,25 +57,35 @@ jobs:
run: |
sudo apt-get install libssl-dev libasio-dev libglpk-dev

- name: Build VROOM v1.10.0
- name: Cache VROOM
id: cache-vroom
uses: actions/cache@v2
env:
cache-name: vroom
with:
path: |
~/vroom-${{ env.VROOMVER }}
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}

- name: Build VROOM
if: steps.cache-vroom.outputs.cache-hit != 'true'
run: |
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
tar -zvxf v1.10.0.tar.gz
cd vroom-1.10.0/src
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
cd ~/vroom-${{ env.VROOMVER }}/src

# Create object file with position independent code using -fPIC flag
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile

cd ~/vroom-${{ env.VROOMVER }}/src
make
cd ..
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV

- name: Configure
run: |
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
mkdir build
cd build
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..

- name: Build
run: |
Expand Down
25 changes: 18 additions & 7 deletions .github/workflows/clang.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
PGP=5433
if [ "${{ matrix.psql }}" == "${pgver}" ]; then PGP=5432; fi
echo "PGPORT=5432" >> $GITHUB_ENV
echo "VROOMVER=1.11.0" >> $GITHUB_ENV

- name: Add PostgreSQL APT repository
run: |
Expand All @@ -59,25 +60,35 @@ jobs:
run: |
sudo apt-get install libssl-dev libasio-dev libglpk-dev

- name: Build VROOM v1.10.0
- name: Cache VROOM
id: cache-vroom
uses: actions/cache@v2
env:
cache-name: vroom
with:
path: |
~/vroom-${{ env.VROOMVER }}
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}

- name: Build VROOM
if: steps.cache-vroom.outputs.cache-hit != 'true'
run: |
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
tar -zvxf v1.10.0.tar.gz
cd vroom-1.10.0/src
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
cd ~/vroom-${{ env.VROOMVER }}/src

# Create object file with position independent code using -fPIC flag
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile

cd ~/vroom-${{ env.VROOMVER }}/src
make
cd ..
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV

- name: Configure
run: |
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
mkdir build
cd build
CXX=clang++ CC=clang cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=${{ matrix.release }} -DWITH_DOC=OFF -DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
CXX=clang++ CC=clang cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=${{ matrix.release }} -DWITH_DOC=OFF -DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..

- name: Build
run: |
Expand Down
25 changes: 18 additions & 7 deletions .github/workflows/doc-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
PROCESS=${{ true }}
fi
echo "PROCESS=${PROCESS}" >> $GITHUB_ENV
echo "VROOMVER=1.11.0" >> $GITHUB_ENV

- name: Get postgres version
if: env.PROCESS == 'true'
Expand Down Expand Up @@ -80,18 +81,28 @@ jobs:
run: |
sudo apt-get install libssl-dev libasio-dev libglpk-dev

- name: Build VROOM v1.10.0
- name: Cache VROOM
id: cache-vroom
uses: actions/cache@v2
env:
cache-name: vroom
with:
path: |
~/vroom-${{ env.VROOMVER }}
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}

- name: Build VROOM
if: steps.cache-vroom.outputs.cache-hit != 'true'
run: |
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
tar -zvxf v1.10.0.tar.gz
cd vroom-1.10.0/src
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
cd ~/vroom-${{ env.VROOMVER }}/src

# Create object file with position independent code using -fPIC flag
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile

cd ~/vroom-${{ env.VROOMVER }}/src
make
cd ..
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV

- name: Configure
if: env.PROCESS == 'true'
Expand All @@ -102,7 +113,7 @@ jobs:
cmake -DLINKCHECK=ON -DHTML=ON -DWITH_DOC=ON \
-DDE=ON -DES=ON -DFR=ON -DJA=ON -DIT=ON \
-DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Release \
-DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
-DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..

- name: Check Links
if: env.PROCESS == 'true'
Expand Down
25 changes: 18 additions & 7 deletions .github/workflows/documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()')
echo "PGVER=${pgver}" >> $GITHUB_ENV
echo "PGIS=3" >> $GITHUB_ENV
echo "VROOMVER=1.11.0" >> $GITHUB_ENV

- name: Add PostgreSQL APT repository
run: |
Expand Down Expand Up @@ -60,18 +61,28 @@ jobs:
run: |
sudo apt-get install libssl-dev libasio-dev libglpk-dev

- name: Build VROOM v1.10.0
- name: Cache VROOM
id: cache-vroom
uses: actions/cache@v2
env:
cache-name: vroom
with:
path: |
~/vroom-${{ env.VROOMVER }}
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}

- name: Build VROOM
if: steps.cache-vroom.outputs.cache-hit != 'true'
run: |
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
tar -zvxf v1.10.0.tar.gz
cd vroom-1.10.0/src
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
cd ~/vroom-${{ env.VROOMVER }}/src

# Create object file with position independent code using -fPIC flag
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile

cd ~/vroom-${{ env.VROOMVER }}/src
make
cd ..
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV

- name: Configure link checks
run: |
Expand All @@ -80,7 +91,7 @@ jobs:
cd build
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Release \
-DWITH_DOC=ON -DES=ON \
-DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
-DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..

- name: Build Documentation
run: |
Expand Down
25 changes: 18 additions & 7 deletions .github/workflows/locale-and-website.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
echo "PGPORT=5432" >> $GITHUB_ENV
echo "PGIS=3" >> $GITHUB_ENV
echo "PROJECT_VERSION=${PROJECT_VERSION}" >> $GITHUB_ENV
echo "VROOMVER=1.11.0" >> $GITHUB_ENV

- name: Extract branch name and commit hash
run: |
Expand Down Expand Up @@ -70,25 +71,35 @@ jobs:
run: |
sudo apt-get install libssl-dev libasio-dev libglpk-dev

- name: Build VROOM v1.10.0
- name: Cache VROOM
id: cache-vroom
uses: actions/cache@v2
env:
cache-name: vroom
with:
path: |
~/vroom-${{ env.VROOMVER }}
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}

- name: Build VROOM
if: steps.cache-vroom.outputs.cache-hit != 'true'
run: |
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
tar -zvxf v1.10.0.tar.gz
cd vroom-1.10.0/src
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
cd ~/vroom-${{ env.VROOMVER }}/src

# Create object file with position independent code using -fPIC flag
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile

cd ~/vroom-${{ env.VROOMVER }}/src
make
cd ..
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV

- name: Configure
run: |
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
mkdir build
cd build
cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release -DLOCALE=ON -DES=ON -DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release -DLOCALE=ON -DES=ON -DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..

- name: Build
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
run: |
brew install openssl asio glpk

- name: Build VROOM v1.10.0
- name: Build VROOM v1.11.0
run: |
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
tar -zvxf v1.10.0.tar.gz
cd vroom-1.10.0/src
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.11.0.tar.gz
tar -zvxf v1.11.0.tar.gz
cd vroom-1.11.0/src

# Source: https://github.com/VROOM-Project/vroom/issues/378
ln -s /usr/local/opt/openssl/include/openssl /usr/local/include
Expand Down
25 changes: 18 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
echo "PGPORT=5432" >> $GITHUB_ENV
echo "PGIS=3" >> $GITHUB_ENV
echo "PROJECT_VERSION=${PROJECT_VERSION}" >> $GITHUB_ENV
echo "VROOMVER=1.11.0" >> $GITHUB_ENV

- name: Verify Tag Name
run: |
Expand Down Expand Up @@ -78,25 +79,35 @@ jobs:
run: |
sudo apt-get install libssl-dev libasio-dev libglpk-dev

- name: Build VROOM v1.10.0
- name: Cache VROOM
id: cache-vroom
uses: actions/cache@v2
env:
cache-name: vroom
with:
path: |
~/vroom-${{ env.VROOMVER }}
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}

- name: Build VROOM
if: steps.cache-vroom.outputs.cache-hit != 'true'
run: |
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
tar -zvxf v1.10.0.tar.gz
cd vroom-1.10.0/src
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
cd ~/vroom-${{ env.VROOMVER }}/src

# Create object file with position independent code using -fPIC flag
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile

cd ~/vroom-${{ env.VROOMVER }}/src
make
cd ..
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV

- name: Configure
run: |
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
mkdir build
cd build
cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release -DES=ON -DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release -DES=ON -DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..

- name: Build
run: |
Expand Down
Loading