Merge branch 'dev'

Author: fontanf

.gitattributes

@@ -1 +1 @@
-data/* linguist-vendored
+data/** linguist-vendored

.ycm_extra_conf.py

@@ -4,14 +4,39 @@ def Settings(**kwargs):
                 '-x', 'c++',
                 '-Wall', '-Wextra', '-Werror',
                 '-I', '.',
-                '-I', './bazel-packingsolver/external/json/single_include/',
-                '-I', './bazel-packingsolver/external/googletest/googletest/include/',
-                '-I', './bazel-packingsolver/external/boost/',
-                '-I', './bazel-packingsolver/external/optimizationtools/',
-                # '-I', './../optimizationtools/',
-                '-I', './bazel-packingsolver/external/treesearchsolver/',
-                # '-I', './../treesearchsolver/',
-                '-I', './bazel-packingsolver/external/columngenerationsolver/',
-                # '-I', './../columngenerationsolver/',
+
+                '-I', './bazel-packingsolver/external/'
+                'json/single_include/',
+
+                '-I', './bazel-packingsolver/external/'
+                'googletest/googletest/include/',
+
+                '-I', './bazel-packingsolver/external/'
+                'boost/',
+
+                # optimizationtools
+                '-I', './bazel-packingsolver/external/'
+                # '-I', './../'
+                'optimizationtools/',
+
+                # treesearchsolver
+                '-I', './bazel-packingsolver/external/'
+                # '-I', './../'
+                'treesearchsolver/',
+
+                # knapsacksolver
+                # '-I', './bazel-packingsolver/external/'
+                '-I', './../'
+                'knapsacksolver/',
+
+                # columngenerationsolver
+                '-I', './bazel-packingsolver/external/'
+                # '-I', './../'
+                'columngenerationsolver/',
+
+                # AMPL
+                '-DAMPL_FOUND',
+                '-I', '/home/florian/Programmes/ampl.linux-intel64/amplapi/include/'
+
                 ],
             }

README.md

@@ -34,8 +34,7 @@ cc_library(
 git_repository(
     name = "optimizationtools",
     remote = "https://github.com/fontanf/optimizationtools.git",
-    commit = "d7299a707f3b6b3b8aa8c428f5254b9ea39bfc53",
-    shallow_since = "1656765328 +0200",
+    commit = "6c40c5ba2890dbd2107962d5ef3fc120c9b11dc2",
 )
 
 local_repository(
@@ -44,38 +43,67 @@ local_repository(
 )
 
 git_repository(
-    name = "treesearchsolver_",
+    name = "treesearchsolver",
     remote = "https://github.com/fontanf/treesearchsolver.git",
-    commit = "c39a99bb46ef73f4bd092460517d530f3a273569",
-    shallow_since = "1655023961 +0200",
+    commit = "d0236497be177160b4ec242ae53edadce93909d1",
+    shallow_since = "1664086189 +0200",
 )
 
 local_repository(
-    name = "treesearchsolver",
+    name = "treesearchsolver_",
     path = "../treesearchsolver/",
 )
 
 git_repository(
     name = "columngenerationsolver",
     remote = "https://github.com/fontanf/columngenerationsolver.git",
-    commit = "40c2daef0bdb8a83330e472b7a4103a4ff38c614",
-    shallow_since = "1655662016 +0200",
+    commit = "2595e3ad316143827d8a8fa943d5713d2b180b70",
+    shallow_since = "1672489298 +0100",
 )
 
 local_repository(
     name = "columngenerationsolver_",
     path = "../columngenerationsolver/",
 )
 
+git_repository(
+    name = "knapsacksolver",
+    remote = "https://github.com/fontanf/knapsacksolver.git",
+    commit = "5464348be438e0b339f30c5f4f72cdaf701c99ec",
+)
+
+local_repository(
+    name = "knapsacksolver_",
+    path = "../knapsacksolver/",
+)
+
 new_local_repository(
     name = "coinor",
     path = "/home/florian/Programmes/coinbrew/",
     build_file_content = """
 cc_library(
-    name = "coinor",
-    hdrs = glob(["dist/include/**/*.h*"], exclude_directories = 0),
-    strip_include_prefix = "dist/include/",
-    srcs = glob(["dist/lib/**/*.so"], exclude_directories = 0),
+    name = "osi",
+    hdrs = glob(["dist/include/coin/Osi*.h*"], exclude_directories = 0),
+    strip_include_prefix = "dist/include/coin/",
+    visibility = ["//visibility:public"],
+)
+cc_library(
+    name = "coinutils",
+    hdrs = glob(["dist/include/coin/Coin*.h*"], exclude_directories = 0),
+    strip_include_prefix = "dist/include/coin/",
+    srcs = [
+        "dist/lib/libCoinUtils.so",
+    ],
+    visibility = ["//visibility:public"],
+)
+cc_library(
+    name = "clp",
+    hdrs = glob(["dist/include/coin/Clp*.h*"], exclude_directories = 0),
+    strip_include_prefix = "dist/include/coin",
+    srcs = [
+        "dist/lib/libClp.so",
+    ],
+    deps = [":coinutils", ":osi"],
     visibility = ["//visibility:public"],
 )
 """,
@@ -141,15 +169,32 @@ cc_library(
 
 new_local_repository(
     name = "xpress",
-    path = "/home/florian/Programmes/",
+    path = "/opt/xpressmp/",
     build_file_content = """
 cc_library(
     name = "xpress",
-    hdrs = [
-    ],
+    hdrs = glob(["include/*.h"], exclude_directories = 0),
     strip_include_prefix = "include/",
-    srcs = [
-    ],
+    srcs = ["lib/libxprs.so"],
+    visibility = ["//visibility:public"],
+)
+""",
+)
+
+new_local_repository(
+    name = "ampl",
+    path = "/home/florian/Programmes/ampl.linux-intel64/amplapi/",
+    # path = "/home/florian/Programmes/ampl-z-13.1.20220703-Linux-64/amplapi/",
+    build_file_content = """
+cc_library(
+    name = "ampl",
+    hdrs = glob([
+            "include/ampl/*.h",
+            "include/ampl/ep/*.h",
+            "include/ampl/ep/format.cc",
+        ], exclude_directories = 0),
+    strip_include_prefix = "include/",
+    srcs = ["lib/libampl.so"],
     visibility = ["//visibility:public"],
 )
 """,

WORKSPACE

@@ -0,0 +1,6 @@
+filegroup(
+        name = "box",
+        srcs = glob(["**/*.csv"]),
+        visibility = ["//visibility:public"],
+)
+

data/box/BUILD

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_100_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,78,49,47,63,70
+1,46,45,43,63,75
+2,98,44,36,51,69

data/box/bischoff1995/BR1.txt_100_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_10_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,68,66,31,3,44
+1,120,34,26,51,41
+2,95,76,60,63,45

data/box/bischoff1995/BR1.txt_10_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_11_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,74,63,61,63,33
+1,71,60,25,3,36
+2,106,80,59,63,33

data/box/bischoff1995/BR1.txt_11_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_12_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,95,80,57,63,38
+1,112,87,23,3,29
+2,116,41,40,51,37

data/box/bischoff1995/BR1.txt_12_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_13_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,52,36,25,51,112
+1,63,37,21,51,76
+2,100,61,36,51,96

data/box/bischoff1995/BR1.txt_13_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_14_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,68,48,31,51,45
+1,104,80,63,63,41
+2,82,46,21,3,46

data/box/bischoff1995/BR1.txt_14_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_15_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,100,44,37,51,32
+1,90,78,55,63,49
+2,65,57,42,63,38

data/box/bischoff1995/BR1.txt_15_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_16_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,43,40,39,63,49
+1,97,76,40,51,51
+2,67,63,47,63,59

data/box/bischoff1995/BR1.txt_16_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_17_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,72,49,35,51,72
+1,75,66,47,63,76
+2,78,30,22,51,65

data/box/bischoff1995/BR1.txt_17_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_18_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,104,55,30,51,25
+1,92,89,73,63,24
+2,88,88,43,3,33

data/box/bischoff1995/BR1.txt_18_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_19_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,60,45,26,51,40
+1,71,43,39,63,40
+2,99,71,64,63,50

data/box/bischoff1995/BR1.txt_19_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_1_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,108,76,30,3,40
+1,110,43,25,51,33
+2,92,81,55,63,39

data/box/bischoff1995/BR1.txt_1_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_20_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,97,77,66,63,28
+1,81,69,69,63,32
+2,109,53,24,3,28

data/box/bischoff1995/BR1.txt_20_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_21_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,109,93,72,63,27
+1,95,67,32,3,26
+2,119,45,36,51,26

data/box/bischoff1995/BR1.txt_21_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_22_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,89,78,50,63,29
+1,73,65,46,63,51
+2,94,66,39,51,36

data/box/bischoff1995/BR1.txt_22_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_23_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,84,81,23,3,50
+1,115,72,64,63,34
+2,77,49,25,51,44

data/box/bischoff1995/BR1.txt_23_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_24_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,113,80,29,3,35
+1,98,65,62,63,34
+2,60,59,46,63,45

data/box/bischoff1995/BR1.txt_24_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_25_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,75,54,35,51,47
+1,107,60,49,51,45
+2,70,67,42,63,47

data/box/bischoff1995/BR1.txt_25_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_26_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,86,71,41,51,46
+1,75,58,58,63,41
+2,100,81,27,3,37

data/box/bischoff1995/BR1.txt_26_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_27_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,118,66,47,51,39
+1,99,56,25,3,34
+2,91,83,48,63,30

data/box/bischoff1995/BR1.txt_27_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220

data/box/bischoff1995/BR1.txt_28_bins.csv

@@ -0,0 +1,4 @@
+ID,X,Y,Z,ROTATIONS,COPIES
+0,62,59,52,63,32
+1,54,52,50,63,39
+2,102,69,65,63,40

data/box/bischoff1995/BR1.txt_28_items.csv

@@ -0,0 +1,2 @@
+ID,X,Y,Z
+0,587,233,220