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

renamed examples to cpp

Browse Source
This commit is contained in:
lperron@google.com
2012-03-28 13:59:16 +00:00
parent 93d022c894
commit 5e11e3ccb0
35 changed files with 69 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -17,8 +17,8 @@ or-tools/
bin/ <- Directory where all binaries will be compiled.
com/ <- Directory that contains all java code.
constraint_solver/ <- The main directory for the constraint solver library.
cpp/ <- C++ examples
dependencies/ <- Directory that will contain built dependencies.
examples/ <- C++ examples
gen/ <- Directory that will contain generated files.
graph/ <- Graph algorithms.
lib/ <- Directory where all libraries and jar files will go.

0
examples/README → cpp/README
View File

0
examples/costas_array.cc → cpp/costas_array.cc
View File

0
examples/cryptarithm.cc → cpp/cryptarithm.cc
View File

0
examples/cvrptw.cc → cpp/cvrptw.cc
View File

4
examples/dimacs_assignment.cc → cpp/dimacs_assignment.cc
View File

@@ -25,8 +25,8 @@
#include "algorithms/hungarian.h"
#include "graph/ebert_graph.h"
#include "graph/linear_assignment.h"
#include "examples/parse_dimacs_assignment.h"
#include "examples/print_dimacs_assignment.h"
#include "cpp/parse_dimacs_assignment.h"
#include "cpp/print_dimacs_assignment.h"
DEFINE_bool(assignment_compare_hungarian, false,
"Compare result and speed against Hungarian method.");

0
examples/dobble_ls.cc → cpp/dobble_ls.cc
View File

0
examples/flow_api.cc → cpp/flow_api.cc
View File

0
examples/global_arith.cc → cpp/global_arith.cc
View File

0
examples/global_arith.h → cpp/global_arith.h
View File

0
examples/golomb.cc → cpp/golomb.cc
View File

0
examples/integer_programming.cc → cpp/integer_programming.cc
View File

2
examples/jobshop.cc → cpp/jobshop.cc
View File

@@ -41,7 +41,7 @@
#include "base/logging.h"
#include "base/stringprintf.h"
#include "constraint_solver/constraint_solver.h"
#include "examples/jobshop.h"
#include "cpp/jobshop.h"
DEFINE_string(
data_file,

0
examples/jobshop.h → cpp/jobshop.h
View File

2
examples/jobshop_ls.cc → cpp/jobshop_ls.cc
View File

@@ -43,7 +43,7 @@
#include "base/bitmap.h"
#include "constraint_solver/constraint_solver.h"
#include "constraint_solver/constraint_solveri.h"
#include "examples/jobshop.h"
#include "cpp/jobshop.h"
DEFINE_string(
data_file,

0
examples/linear_assignment_api.cc → cpp/linear_assignment_api.cc
View File

0
examples/linear_programming.cc → cpp/linear_programming.cc
View File

0
examples/linear_solver_protocol_buffers.cc → cpp/linear_solver_protocol_buffers.cc
View File

0
examples/magic_square.cc → cpp/magic_square.cc
View File

0
examples/model_util.cc → cpp/model_util.cc
View File

0
examples/multidim_knapsack.cc → cpp/multidim_knapsack.cc
View File

0
examples/network_routing.cc → cpp/network_routing.cc
View File

0
examples/nqueens.cc → cpp/nqueens.cc
View File

2
examples/parse_dimacs_assignment.cc → cpp/parse_dimacs_assignment.cc
View File

@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "examples/parse_dimacs_assignment.h"
#include "cpp/parse_dimacs_assignment.h"
#include <algorithm>
#include <cstdio>

0
examples/parse_dimacs_assignment.h → cpp/parse_dimacs_assignment.h
View File

0
examples/pdptw.cc → cpp/pdptw.cc
View File

2
examples/print_dimacs_assignment.cc → cpp/print_dimacs_assignment.cc
View File

@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "examples/print_dimacs_assignment.h"
#include "cpp/print_dimacs_assignment.h"
#include <cstdio>
#include <string>

0
examples/print_dimacs_assignment.h → cpp/print_dimacs_assignment.h
View File

0
examples/sports_scheduling.cc → cpp/sports_scheduling.cc
View File

0
examples/strawberry_fields_with_column_generation.cc → cpp/strawberry_fields_with_column_generation.cc
View File

0
examples/tsp.cc → cpp/tsp.cc
View File

98
makefiles/Makefile.cpp.mk
View File

@@ -490,148 +490,148 @@ DIMACS_LIB_OS=\
$(OBJ_DIR)/parse_dimacs_assignment.$O\
$(OBJ_DIR)/print_dimacs_assignment.$O
$(OBJ_DIR)/parse_dimacs_assignment.$O:$(EX_DIR)examples/parse_dimacs_assignment.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/parse_dimacs_assignment.cc $(OBJ_OUT)parse_dimacs_assignment.$O
$(OBJ_DIR)/print_dimacs_assignment.$O:$(EX_DIR)examples/print_dimacs_assignment.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/print_dimacs_assignment.cc $(OBJ_OUT)print_dimacs_assignment.$O
$(OBJ_DIR)/parse_dimacs_assignment.$O:$(EX_DIR)cpp/parse_dimacs_assignment.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/parse_dimacs_assignment.cc $(OBJ_OUT)parse_dimacs_assignment.$O
$(OBJ_DIR)/print_dimacs_assignment.$O:$(EX_DIR)cpp/print_dimacs_assignment.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/print_dimacs_assignment.cc $(OBJ_OUT)print_dimacs_assignment.$O
$(LIB_DIR)/$(LIBPREFIX)dimacs.$(LIBSUFFIX): $(DIMACS_LIB_OS)
$(LINKCMD) $(LINKPREFIX)$(LIB_DIR)$S$(LIBPREFIX)dimacs.$(LIBSUFFIX) $(DIMACS_LIB_OS)
# Flow and linear assignment examples
# Flow and linear assignment cpp
$(OBJ_DIR)/linear_assignment_api.$O:$(EX_DIR)examples/linear_assignment_api.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/linear_assignment_api.cc $(OBJ_OUT)linear_assignment_api.$O
$(OBJ_DIR)/linear_assignment_api.$O:$(EX_DIR)cpp/linear_assignment_api.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/linear_assignment_api.cc $(OBJ_OUT)linear_assignment_api.$O
$(BIN_DIR)/linear_assignment_api$E: $(GRAPH_DEPS) $(OBJ_DIR)/linear_assignment_api.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/linear_assignment_api.$O $(GRAPH_LNK) $(LDFLAGS) $(EXEOUT)linear_assignment_api$E
$(OBJ_DIR)/flow_api.$O:$(EX_DIR)examples/flow_api.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/flow_api.cc $(OBJ_OUT)flow_api.$O
$(OBJ_DIR)/flow_api.$O:$(EX_DIR)cpp/flow_api.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/flow_api.cc $(OBJ_OUT)flow_api.$O
$(BIN_DIR)/flow_api$E: $(GRAPH_DEPS) $(OBJ_DIR)/flow_api.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/flow_api.$O $(GRAPH_LNK) $(LDFLAGS) $(EXEOUT)flow_api$E
$(OBJ_DIR)/dimacs_assignment.$O:$(EX_DIR)examples/dimacs_assignment.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/dimacs_assignment.cc $(OBJ_OUT)dimacs_assignment.$O
$(OBJ_DIR)/dimacs_assignment.$O:$(EX_DIR)cpp/dimacs_assignment.cc
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/dimacs_assignment.cc $(OBJ_OUT)dimacs_assignment.$O
$(BIN_DIR)/dimacs_assignment$E: $(ALGORITHMS_DEPS) $(GRAPH_DEPS) $(DIMACS_LIBS) $(OBJ_DIR)/dimacs_assignment.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/dimacs_assignment.$O $(DIMACS_LNK) $(ALGORITHMS_LNK) $(GRAPH_LNK) $(LDFLAGS) $(EXEOUT)dimacs_assignment$E
# Pure CP and Routing Examples
$(OBJ_DIR)/costas_array.$O: $(EX_DIR)examples/costas_array.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/costas_array.cc $(OBJ_OUT)costas_array.$O
$(OBJ_DIR)/costas_array.$O: $(EX_DIR)cpp/costas_array.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/costas_array.cc $(OBJ_OUT)costas_array.$O
$(BIN_DIR)/costas_array$E: $(CP_DEPS) $(OBJ_DIR)/costas_array.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/costas_array.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)costas_array$E
$(OBJ_DIR)/cryptarithm.$O:$(EX_DIR)examples/cryptarithm.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/cryptarithm.cc $(OBJ_OUT)cryptarithm.$O
$(OBJ_DIR)/cryptarithm.$O:$(EX_DIR)cpp/cryptarithm.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/cryptarithm.cc $(OBJ_OUT)cryptarithm.$O
$(BIN_DIR)/cryptarithm$E: $(CP_DEPS) $(OBJ_DIR)/cryptarithm.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/cryptarithm.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)cryptarithm$E
$(OBJ_DIR)/cvrptw.$O: $(EX_DIR)examples/cvrptw.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/cvrptw.cc $(OBJ_OUT)cvrptw.$O
$(OBJ_DIR)/cvrptw.$O: $(EX_DIR)cpp/cvrptw.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/cvrptw.cc $(OBJ_OUT)cvrptw.$O
$(BIN_DIR)/cvrptw$E: $(ROUTING_DEPS) $(OBJ_DIR)/cvrptw.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/cvrptw.$O $(ROUTING_LNK) $(LDFLAGS) $(EXEOUT)cvrptw$E
$(OBJ_DIR)/dobble_ls.$O:$(EX_DIR)examples/dobble_ls.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/dobble_ls.cc $(OBJ_OUT)dobble_ls.$O
$(OBJ_DIR)/dobble_ls.$O:$(EX_DIR)cpp/dobble_ls.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/dobble_ls.cc $(OBJ_OUT)dobble_ls.$O
$(BIN_DIR)/dobble_ls$E: $(CP_DEPS) $(OBJ_DIR)/dobble_ls.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/dobble_ls.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)dobble_ls$E
$(OBJ_DIR)/golomb.$O:$(EX_DIR)examples/golomb.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/golomb.cc $(OBJ_OUT)golomb.$O
$(OBJ_DIR)/golomb.$O:$(EX_DIR)cpp/golomb.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/golomb.cc $(OBJ_OUT)golomb.$O
$(BIN_DIR)/golomb$E: $(CP_DEPS) $(OBJ_DIR)/golomb.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/golomb.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)golomb$E
$(OBJ_DIR)/jobshop.$O:$(EX_DIR)examples/jobshop.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/jobshop.cc $(OBJ_OUT)jobshop.$O
$(OBJ_DIR)/jobshop.$O:$(EX_DIR)cpp/jobshop.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/jobshop.cc $(OBJ_OUT)jobshop.$O
$(BIN_DIR)/jobshop$E: $(CP_DEPS) $(OBJ_DIR)/jobshop.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/jobshop.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)jobshop$E
$(OBJ_DIR)/jobshop_ls.$O:$(EX_DIR)examples/jobshop_ls.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/jobshop_ls.cc $(OBJ_OUT)jobshop_ls.$O
$(OBJ_DIR)/jobshop_ls.$O:$(EX_DIR)cpp/jobshop_ls.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/jobshop_ls.cc $(OBJ_OUT)jobshop_ls.$O
$(BIN_DIR)/jobshop_ls$E: $(CP_DEPS) $(OBJ_DIR)/jobshop_ls.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/jobshop_ls.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)jobshop_ls$E
$(OBJ_DIR)/magic_square.$O:$(EX_DIR)examples/magic_square.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/magic_square.cc $(OBJ_OUT)magic_square.$O
$(OBJ_DIR)/magic_square.$O:$(EX_DIR)cpp/magic_square.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/magic_square.cc $(OBJ_OUT)magic_square.$O
$(BIN_DIR)/magic_square$E: $(CP_DEPS) $(OBJ_DIR)/magic_square.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/magic_square.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)magic_square$E
$(OBJ_DIR)/model_util.$O:$(EX_DIR)examples/model_util.cc $(GEN_DIR)/constraint_solver/model.pb.h $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/model_util.cc $(OBJ_OUT)model_util.$O
$(OBJ_DIR)/model_util.$O:$(EX_DIR)cpp/model_util.cc $(GEN_DIR)/constraint_solver/model.pb.h $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/model_util.cc $(OBJ_OUT)model_util.$O
$(BIN_DIR)/model_util$E: $(CP_DEPS) $(OBJ_DIR)/model_util.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/model_util.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)model_util$E
$(OBJ_DIR)/multidim_knapsack.$O:$(EX_DIR)examples/multidim_knapsack.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/multidim_knapsack.cc $(OBJ_OUT)multidim_knapsack.$O
$(OBJ_DIR)/multidim_knapsack.$O:$(EX_DIR)cpp/multidim_knapsack.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/multidim_knapsack.cc $(OBJ_OUT)multidim_knapsack.$O
$(BIN_DIR)/multidim_knapsack$E: $(CP_DEPS) $(OBJ_DIR)/multidim_knapsack.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/multidim_knapsack.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)multidim_knapsack$E
$(OBJ_DIR)/network_routing.$O:$(EX_DIR)examples/network_routing.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/network_routing.cc $(OBJ_OUT)network_routing.$O
$(OBJ_DIR)/network_routing.$O:$(EX_DIR)cpp/network_routing.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/network_routing.cc $(OBJ_OUT)network_routing.$O
$(BIN_DIR)/network_routing$E: $(CP_DEPS) $(GRAPH_DEPS) $(OBJ_DIR)/network_routing.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/network_routing.$O $(CP_LNK) $(GRAPH_LNK) $(LDFLAGS) $(EXEOUT)network_routing$E
$(OBJ_DIR)/nqueens.$O: $(EX_DIR)examples/nqueens.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/nqueens.cc $(OBJ_OUT)nqueens.$O
$(OBJ_DIR)/nqueens.$O: $(EX_DIR)cpp/nqueens.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/nqueens.cc $(OBJ_OUT)nqueens.$O
$(BIN_DIR)/nqueens$E: $(CP_DEPS) $(OBJ_DIR)/nqueens.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/nqueens.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)nqueens$E
$(OBJ_DIR)/pdptw.$O: $(EX_DIR)examples/pdptw.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/pdptw.cc $(OBJ_OUT)pdptw.$O
$(OBJ_DIR)/pdptw.$O: $(EX_DIR)cpp/pdptw.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/pdptw.cc $(OBJ_OUT)pdptw.$O
$(BIN_DIR)/pdptw$E: $(ROUTING_DEPS) $(OBJ_DIR)/pdptw.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/pdptw.$O $(ROUTING_LNK) $(LDFLAGS) $(EXEOUT)pdptw$E
$(OBJ_DIR)/sports_scheduling.$O:$(EX_DIR)examples/sports_scheduling.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/sports_scheduling.cc $(OBJ_OUT)sports_scheduling.$O
$(OBJ_DIR)/sports_scheduling.$O:$(EX_DIR)cpp/sports_scheduling.cc $(SRC_DIR)constraint_solver/constraint_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/sports_scheduling.cc $(OBJ_OUT)sports_scheduling.$O
$(BIN_DIR)/sports_scheduling$E: $(CP_DEPS) $(OBJ_DIR)/sports_scheduling.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/sports_scheduling.$O $(CP_LNK) $(LDFLAGS) $(EXEOUT)sports_scheduling$E
$(OBJ_DIR)/tsp.$O: $(EX_DIR)examples/tsp.cc $(SRC_DIR)constraint_solver/routing.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/tsp.cc $(OBJ_OUT)tsp.$O
$(OBJ_DIR)/tsp.$O: $(EX_DIR)cpp/tsp.cc $(SRC_DIR)constraint_solver/routing.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/tsp.cc $(OBJ_OUT)tsp.$O
$(BIN_DIR)/tsp$E: $(ROUTING_DEPS) $(OBJ_DIR)/tsp.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/tsp.$O $(ROUTING_LNK) $(LDFLAGS) $(EXEOUT)tsp$E
# Linear Programming Examples
$(OBJ_DIR)/strawberry_fields_with_column_generation.$O: $(EX_DIR)examples/strawberry_fields_with_column_generation.cc $(SRC_DIR)linear_solver/linear_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/strawberry_fields_with_column_generation.cc $(OBJ_OUT)strawberry_fields_with_column_generation.$O
$(OBJ_DIR)/strawberry_fields_with_column_generation.$O: $(EX_DIR)cpp/strawberry_fields_with_column_generation.cc $(SRC_DIR)linear_solver/linear_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/strawberry_fields_with_column_generation.cc $(OBJ_OUT)strawberry_fields_with_column_generation.$O
$(BIN_DIR)/strawberry_fields_with_column_generation$E: $(LP_DEPS) $(OBJ_DIR)/strawberry_fields_with_column_generation.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/strawberry_fields_with_column_generation.$O $(LP_LNK) $(LDFLAGS) $(EXEOUT)strawberry_fields_with_column_generation$E
$(OBJ_DIR)/linear_programming.$O: $(EX_DIR)examples/linear_programming.cc $(SRC_DIR)linear_solver/linear_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/linear_programming.cc $(OBJ_OUT)linear_programming.$O
$(OBJ_DIR)/linear_programming.$O: $(EX_DIR)cpp/linear_programming.cc $(SRC_DIR)linear_solver/linear_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/linear_programming.cc $(OBJ_OUT)linear_programming.$O
$(BIN_DIR)/linear_programming$E: $(LP_DEPS) $(OBJ_DIR)/linear_programming.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/linear_programming.$O $(LP_LNK) $(LDFLAGS) $(EXEOUT)linear_programming$E
$(OBJ_DIR)/linear_solver_protocol_buffers.$O: $(EX_DIR)examples/linear_solver_protocol_buffers.cc $(SRC_DIR)linear_solver/linear_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/linear_solver_protocol_buffers.cc $(OBJ_OUT)linear_solver_protocol_buffers.$O
$(OBJ_DIR)/linear_solver_protocol_buffers.$O: $(EX_DIR)cpp/linear_solver_protocol_buffers.cc $(SRC_DIR)linear_solver/linear_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/linear_solver_protocol_buffers.cc $(OBJ_OUT)linear_solver_protocol_buffers.$O
$(BIN_DIR)/linear_solver_protocol_buffers$E: $(LP_DEPS) $(OBJ_DIR)/linear_solver_protocol_buffers.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/linear_solver_protocol_buffers.$O $(LP_LNK) $(LDFLAGS) $(EXEOUT)linear_solver_protocol_buffers$E
$(OBJ_DIR)/integer_programming.$O: $(EX_DIR)examples/integer_programming.cc $(SRC_DIR)linear_solver/linear_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)examples/integer_programming.cc $(OBJ_OUT)integer_programming.$O
$(OBJ_DIR)/integer_programming.$O: $(EX_DIR)cpp/integer_programming.cc $(SRC_DIR)linear_solver/linear_solver.h
$(CCC) $(CFLAGS) -c $(EX_DIR)cpp/integer_programming.cc $(OBJ_OUT)integer_programming.$O
$(BIN_DIR)/integer_programming$E: $(LP_DEPS) $(OBJ_DIR)/integer_programming.$O
$(CCC) $(CFLAGS) $(OBJ_DIR)/integer_programming.$O $(LP_LNK) $(LDFLAGS) $(EXEOUT)integer_programming$E

4
makefiles/Makefile.unix
View File

@@ -153,10 +153,10 @@ ifeq ($(PLATFORM),MACOSX)
endif
endif # MAC OS X
CFLAGS = $(SYSCFLAGS) $(DEBUG) -I$(INC_DIR) -I$(OR_ROOT)gen $(GFLAGS_INC) $(ARCH) \
CFLAGS = $(SYSCFLAGS) $(DEBUG) -I$(INC_DIR) -I$(EX_DIR) -I$(OR_ROOT)gen $(GFLAGS_INC) $(ARCH) \
-Wno-deprecated $(PROTOBUF_INC) $(CBC_INC) $(CLP_INC) $(GLPK_INC) \
$(SCIP_INC) $(SPARSEHASH_INC)
JNIFLAGS = $(SYSCFLAGS) $(JNIDEBUG) -I$(INC_DIR) -I$(OR_ROOT)gen $(GFLAGS_INC) $(ARCH) \
JNIFLAGS = $(SYSCFLAGS) $(JNIDEBUG) -I$(INC_DIR) -I$(EX_DIR) -I$(OR_ROOT)gen $(GFLAGS_INC) $(ARCH) \
-Wno-deprecated $(PROTOBUF_INC) $(CBC_INC) $(CLP_INC) $(GLPK_INC) $(SCIP_INC)
LDFLAGS = $(GFLAGS_LNK) $(ZLIB_LNK) $(PROTOBUF_LNK) $(SYS_LNK)
LDLPDEPS = $(GLPK_LNK) $(CBC_LNK) $(CLP_LNK) $(SCIP_LNK)

2
makefiles/Makefile.win
View File

@@ -43,7 +43,7 @@ JAVAC_BIN="$(WINDOWS_JDK_DIR)/bin/javac"
JAVA_BIN="$(WINDOWS_JDK_DIR)/bin/java"
JAR_BIN="$(WINDOWS_JDK_DIR)/bin/jar"
CFLAGS= -nologo $(SYSCFLAGS) $(DEBUG) /I. /Igen $(GFLAGS_INC) $(ZLIB_INC)\
CFLAGS= -nologo $(SYSCFLAGS) $(DEBUG) /I$(INC_DIR) /I$(EX_DIR) /Igen $(GFLAGS_INC) $(ZLIB_INC)\
$(PROTOBUF_INC) $(CBC_INC) $(CLP_INC) $(GLPK_INC) /D__WIN32__ \
$(SPARSEHASH_INC)
JNIFLAGS=$(CFLAGS) $(JAVA_INC)

10
tests/testcp.cs
View File

@@ -389,11 +389,21 @@ public class CsTestCpOperator
Console.WriteLine(c10k.ToString());
}
static void TestDowncast()
{
Solver solver = new Solver("TestDowncast");
IntVar x = solver.MakeIntVar(0, 10, "x");
IntExpr e = x + 1;
IntVar y = e.Var();
Console.WriteLine(y.ToString());
}
static void Main()
{
TestConstructors();
TestConstraintWithExpr();
TestWrappedConstraintWithExpr();
TestBaseEqualityWithExpr();
TestDowncast();
}
}