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)
fontanf · Mar 23, 2021 · a5ffd22 · a5ffd22
1 parent d1717f4
commit a5ffd22
Show file tree

Hide file tree

Showing 68 changed files with 32,139 additions and 32,831 deletions.
diff --git a/README.md b/README.md
@@ -25,12 +25,12 @@ bazel build --define cplex=true -- //...
 
 Execute:
 ```shell
-./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*"
+./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"
 ```
 
 Or in short:
 ```shell
-./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*"
+./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"
 ```
 
 A solution visualizer is available here: https://librallu.gitlab.io/packing-viz/
@@ -68,7 +68,7 @@ options:
   * `3EAR`: `--cut-type-1 three-staged-guillotine --cut-type-2 exact --first-stage-orientation any`
   * `roadef2018`
 
-Compatible algorithms: `A*`, `DFS`, `IMBA*`, `DPA*`
+Compatible algorithms: `A*`, `DFS`, `IMBA*`, `DPA*`, `IBS`
 
 ## Benchmarks
 
@@ -92,6 +92,6 @@ python3 packingsolver/scripts/bench.py "2NEGH-SPP-O" "2NEGH-SPP-R" # ~4h
 python3 packingsolver/scripts/bench.py "3NEGH-CSP-O" "3NEGH-CSP-R" "long2020_CSP" # ~20h
 python3 packingsolver/scripts/bench.py "3GH-CSP-O" "3HG-CSP-O" "3HGV-CSP-O" # ~15h
 python3 packingsolver/scripts/bench.py "2NEGH-CSP-O" "2NEGH-CSP-R" "2GH-CSP-O" # ~30h
-python3 packingsolver/scripts/bench.py "3NEG-VBPP-O" "3NEG-VBPP-R" "2GH-VBPP-O" "2GH-VBPP-R" # ~20h
+python3 packingsolver/scripts/bench.py "3NEG-VBPP-O" "3NEG-VBPP-R" "2GH-VBPP-O" "2GH-VBPP-R" # ~16h
 ```
 
diff --git a/WORKSPACE b/WORKSPACE
@@ -34,8 +34,13 @@ cc_library(
 git_repository(
     name = "optimizationtools",
     remote = "https://github.com/fontanf/optimizationtools.git",
-    commit = "b51d64c7428acfde1ad8798404b1be9b413a1248",
-    shallow_since = "1609062649 +0100",
+    commit = "9dedd30cb51c2691dc16cc6d1e285b564565746f",
+    shallow_since = "1613814462 +0100",
+)
+
+local_repository(
+    name = "optimizationtools_",
+    path = "../optimizationtools/",
 )
 
 git_repository(