always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first external contrib, experimental bucket based allowed assignment constraint from Jean Charles Régin, mostly untested though

Browse Source
This commit is contained in:
lperron@google.com
2012-05-04 19:41:37 +00:00
parent 29b72e5c4b
commit dba43763c7
3 changed files with 1021 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
makefiles/Makefile.cpp.mk
View File

@@ -149,6 +149,7 @@ CONSTRAINT_SOLVER_LIB_OS = \
$(OBJ_DIR)/alldiff_cst.$O\
$(OBJ_DIR)/assignment.$O\
$(OBJ_DIR)/assignment.pb.$O\
$(OBJ_DIR)/bucket_table.$O\
$(OBJ_DIR)/collect_variables.$O\
$(OBJ_DIR)/constraint_solver.$O\
$(OBJ_DIR)/constraints.$O\
@@ -192,6 +193,9 @@ $(OBJ_DIR)/assignment.$O:$(SRC_DIR)/constraint_solver/assignment.cc $(GEN_DIR)/c
$(OBJ_DIR)/assignment.pb.$O:$(GEN_DIR)/constraint_solver/assignment.pb.cc
$(CCC) $(CFLAGS) -c $(GEN_DIR)/constraint_solver/assignment.pb.cc $(OBJ_OUT)assignment.pb.$O
$(OBJ_DIR)/bucket_table.$O:$(SRC_DIR)/constraint_solver/bucket_table.cc
$(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/bucket_table.cc $(OBJ_OUT)bucket_table.$O
$(GEN_DIR)/constraint_solver/assignment.pb.cc:$(SRC_DIR)/constraint_solver/assignment.proto
$(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/constraint_solver/assignment.proto
@@ -636,6 +640,12 @@ $(OBJ_DIR)/mtsearch_test.$O:$(EX_DIR)/tests/mtsearch_test.cc $(SRC_DIR)/constrai
$(BIN_DIR)/mtsearch_test$E: $(CP_DEPS) $(OBJ_DIR)/mtsearch_test.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/mtsearch_test.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)mtsearch_test$E
$(OBJ_DIR)/bucket_table_test.$O:$(EX_DIR)/tests/bucket_table_test.cc $(SRC_DIR)/constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)$Stests/bucket_table_test.cc $(OBJ_OUT)bucket_table_test.$O
$(BIN_DIR)/bucket_table_test$E: $(CP_DEPS) $(OBJ_DIR)/bucket_table_test.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/bucket_table_test.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)bucket_table_test$E
# Linear Programming Examples
$(OBJ_DIR)/strawberry_fields_with_column_generation.$O: $(EX_DIR)/cpp/strawberry_fields_with_column_generation.cc $(SRC_DIR)/linear_solver/linear_solver.h