Skip to content

Commit a5ffd22

Browse files
committed
Squashed commit of the following:
commit b97755486ac9f1b498c49bf07138faa1533f5da2 Author: Florian Fontan <[email protected]> Date: Tue Mar 23 18:52:44 2021 +0100 Implement Iterative Beam Search commit f7087f3cb682056ea0e36a7dfa903e04385ee089 Author: Florian Fontan <[email protected]> Date: Thu Mar 11 19:47:37 2021 +0100 Try new dominance strategy commit e655843 Author: Florian Fontan <[email protected]> Date: Sat Feb 20 10:48:45 2021 +0100 Remove C++20 requirement (now requires C++11)
1 parent d1717f4 commit a5ffd22

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+32139
-32831
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ bazel build --define cplex=true -- //...
2525

2626
Execute:
2727
```shell
28-
./bazel-bin/packingsolver/main --verbose --problem-type rectangleguillotine --objective knapsack --items data/rectangle/alvarez2002/ATP35_items.csv --bins data/rectangle/alvarez2002/ATP35_bins.csv --certificate ATP35_solution.csv --output ATP35_output.json --time-limit 1 -q "RG -p 3NHO -c 4" -a "IMBA*" -q "RG -p 3NHO -c 5" -a "IMBA*"
28+
./bazel-bin/packingsolver/main --verbose --problem-type rectangleguillotine --objective knapsack --items data/rectangle/alvarez2002/ATP35_items.csv --bins data/rectangle/alvarez2002/ATP35_bins.csv --certificate ATP35_solution.csv --output ATP35_output.json --time-limit 1 -q "RG -p 3NHO -c 4" -a "IBS" -q "RG -p 3NHO -c 5" -a "IBS"
2929
```
3030

3131
Or in short:
3232
```shell
33-
./bazel-bin/packingsolver/main -v -p RG -f KP -i data/rectangle/alvarez2002/ATP35 -c ATP35_solution.csv -o ATP35_output.json -t 1 -q "RG -p 3NHO -c 4" -a "IMBA*" -q "RG -p 3NHO -c 5" -a "IMBA*"
33+
./bazel-bin/packingsolver/main -v -p RG -f KP -i data/rectangle/alvarez2002/ATP35 -c ATP35_solution.csv -o ATP35_output.json -t 1 -q "RG -p 3NHO -c 4" -a "IBS" -q "RG -p 3NHO -c 5" -a "IBS"
3434
```
3535

3636
A solution visualizer is available here: https://librallu.gitlab.io/packing-viz/
@@ -68,7 +68,7 @@ options:
6868
* `3EAR`: `--cut-type-1 three-staged-guillotine --cut-type-2 exact --first-stage-orientation any`
6969
* `roadef2018`
7070

71-
Compatible algorithms: `A*`, `DFS`, `IMBA*`, `DPA*`
71+
Compatible algorithms: `A*`, `DFS`, `IMBA*`, `DPA*`, `IBS`
7272

7373
## Benchmarks
7474

@@ -92,6 +92,6 @@ python3 packingsolver/scripts/bench.py "2NEGH-SPP-O" "2NEGH-SPP-R" # ~4h
9292
python3 packingsolver/scripts/bench.py "3NEGH-CSP-O" "3NEGH-CSP-R" "long2020_CSP" # ~20h
9393
python3 packingsolver/scripts/bench.py "3GH-CSP-O" "3HG-CSP-O" "3HGV-CSP-O" # ~15h
9494
python3 packingsolver/scripts/bench.py "2NEGH-CSP-O" "2NEGH-CSP-R" "2GH-CSP-O" # ~30h
95-
python3 packingsolver/scripts/bench.py "3NEG-VBPP-O" "3NEG-VBPP-R" "2GH-VBPP-O" "2GH-VBPP-R" # ~20h
95+
python3 packingsolver/scripts/bench.py "3NEG-VBPP-O" "3NEG-VBPP-R" "2GH-VBPP-O" "2GH-VBPP-R" # ~16h
9696
```
9797

WORKSPACE

+7-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,13 @@ cc_library(
3434
git_repository(
3535
name = "optimizationtools",
3636
remote = "https://github.com/fontanf/optimizationtools.git",
37-
commit = "b51d64c7428acfde1ad8798404b1be9b413a1248",
38-
shallow_since = "1609062649 +0100",
37+
commit = "9dedd30cb51c2691dc16cc6d1e285b564565746f",
38+
shallow_since = "1613814462 +0100",
39+
)
40+
41+
local_repository(
42+
name = "optimizationtools_",
43+
path = "../optimizationtools/",
3944
)
4045

4146
git_repository(

0 commit comments

Comments
 (0)