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

rename lib cp to lib constraint_solver

Browse Source
This commit is contained in:
lperron@google.com
2010-09-23 12:16:17 +00:00
parent 43f0aa04f2
commit 609f77243e
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@@ -39,14 +39,16 @@ BINARIES=nqueens golomb magic_square cryptarithm
all: libs $(BINARIES) pylib
libs: \
libcp.a \
LIBS = \
libconstraint_solver.a \
libutil.a \
libbase.a \
libalgorithms.a \
libgraph.a \
libshortestpaths.a
libs: $(LIBS)
clean:
rm -f *.a
rm -f objs/*.o
@@ -54,7 +56,7 @@ clean:
rm constraint_solver/*wrap*
rm -f *.so
# CP Lib.
# Constraint Solver Lib.
CP_LIB_OBJS = \
objs/alldiff_cst.o\
@@ -130,8 +132,8 @@ objs/timetabling.o:constraint_solver/timetabling.cc
objs/utilities.o:constraint_solver/utilities.cc
$(CCC) $(CFLAGS) -c constraint_solver/utilities.cc -o objs/utilities.o
libcp.a: $(CP_LIB_OBJS)
ar rv libcp.a $(CP_LIB_OBJS)
libconstraint_solver.a: $(CP_LIB_OBJS)
ar rv libconstraint_solver.a $(CP_LIB_OBJS)
# Util library.
@@ -212,26 +214,26 @@ libbase.a: $(BASE_LIB_OBJS)
objs/cryptarithm.o:examples/cryptarithm.cc
$(CCC) $(CFLAGS) -c examples/cryptarithm.cc -o objs/cryptarithm.o
cryptarithm: libutil.a libcp.a libbase.a objs/cryptarithm.o
$(CCC) $(CFLAGS) $(LDFLAGS) objs/cryptarithm.o libcp.a libutil.a libbase.a -o cryptarithm
cryptarithm: $(LIBS) objs/cryptarithm.o
$(CCC) $(CFLAGS) $(LDFLAGS) objs/cryptarithm.o $(LIBS) -o cryptarithm
objs/golomb.o:examples/golomb.cc
$(CCC) $(CFLAGS) -c examples/golomb.cc -o objs/golomb.o
golomb: libutil.a libcp.a libbase.a objs/golomb.o
$(CCC) $(CFLAGS) $(LDFLAGS) objs/golomb.o libcp.a libutil.a libbase.a -o golomb
golomb: $(LIBS) objs/golomb.o
$(CCC) $(CFLAGS) $(LDFLAGS) objs/golomb.o $(LIBS) -o golomb
objs/magic_square.o:examples/magic_square.cc
$(CCC) $(CFLAGS) -c examples/magic_square.cc -o objs/magic_square.o
magic_square: libutil.a libcp.a libbase.a objs/magic_square.o
$(CCC) $(CFLAGS) $(LDFLAGS) objs/magic_square.o libcp.a libutil.a libbase.a -o magic_square
magic_square: $(LIBS) objs/magic_square.o
$(CCC) $(CFLAGS) $(LDFLAGS) objs/magic_square.o $(LIBS) -o magic_square
objs/nqueens.o: examples/nqueens.cc
$(CCC) $(CFLAGS) -c examples/nqueens.cc -o objs/nqueens.o
nqueens: libutil.a libcp.a libbase.a objs/nqueens.o
$(CCC) $(CFLAGS) $(LDFLAGS) objs/nqueens.o libcp.a libutil.a libbase.a -o nqueens
nqueens: $(LIBS) objs/nqueens.o
$(CCC) $(CFLAGS) $(LDFLAGS) objs/nqueens.o $(LIBS) -o nqueens
# SWIG
@@ -246,5 +248,5 @@ objs/constraint_solver_wrap.o: constraint_solver/constraint_solver_wrap.cc
$(CCC) $(CFLAGS) $(PYTHON_INC) -c constraint_solver/constraint_solver_wrap.cc -o objs/constraint_solver_wrap.o
_pywrapcp.so: objs/constraint_solver_wrap.o $(LIBS)
$(LD) -o _pywrapcp.so objs/constraint_solver_wrap.o libcp.a libutil.a libbase.a $(GFLAGS_LNK)
$(LD) -o _pywrapcp.so objs/constraint_solver_wrap.o $(LIBS) $(GFLAGS_LNK)

6
Makefile.msv
View File

@@ -25,7 +25,7 @@ BINARIES=nqueens.exe golomb.exe magic_square.exe cryptarithm.exe
all: libs $(BINARIES)
LIBS = \
cp.lib \
constraint_solver.lib \
util.lib \
base.lib \
gflags.lib \
@@ -117,8 +117,8 @@ objs/timetabling.obj:constraint_solver/timetabling.cc
objs/utilities.obj:constraint_solver/utilities.cc
$(CCC) $(CFLAGS) -c constraint_solver/utilities.cc /Foobjs/utilities.obj
cp.lib: $(CP_LIB_OBJS)
lib /OUT:cp.lib $(CP_LIB_OBJS)
constraint_solver.lib: $(CP_LIB_OBJS)
lib /OUT:constraint_solver.lib $(CP_LIB_OBJS)
# Util library.

2
base/adjustable_priority_queue.h
View File

@@ -131,4 +131,4 @@ template<typename T> class AdjustablePriorityQueue {
};
} // namespace operations_research
#endif // BASE_ADJUSTABLE_PRIORITY_QUEUE_H
#endif // BASE_ADJUSTABLE_PRIORITY_QUEUE_H

6
constraint_solver/search.cc
View File

@@ -232,7 +232,7 @@ SearchMonitor* Solver::MakeSearchLog(int period, IntVar* const obj,
class SearchTrace : public SearchMonitor {
public:
explicit SearchTrace(Solver* const s, const string& prefix)
SearchTrace(Solver* const s, const string& prefix)
: SearchMonitor(s), prefix_(prefix) {}
virtual ~SearchTrace() {}
@@ -833,8 +833,8 @@ int64 CenterValueSelector::Select(const IntVar* const v, int64 id) {
class CheapestValueSelector : public ValueSelector {
public:
explicit CheapestValueSelector(ResultCallback2<int64, int64, int64>* eval,
ResultCallback1<int64, int64>* tie_breaker)
CheapestValueSelector(ResultCallback2<int64, int64, int64>* eval,
ResultCallback1<int64, int64>* tie_breaker)
: eval_(eval), tie_breaker_(tie_breaker) {}
virtual ~CheapestValueSelector() {}
virtual int64 Select(const IntVar* const v, int64 id);