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

hybrid is not accessible from python, java

Browse Source
This commit is contained in:
lperron@google.com
2011-06-24 08:38:42 +00:00
parent 7b2e672b30
commit 03e4068eca
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.build.python
View File

@@ -47,8 +47,8 @@ gen/constraint_solver/constraint_solver_wrap.cc: gen/constraint_solver/pywrapcp.
objs/constraint_solver_wrap.$O: gen/constraint_solver/constraint_solver_wrap.cc
$(CCC) $(CFLAGS) $(PYTHON_INC) -c gen/constraint_solver/constraint_solver_wrap.cc $(OBJOUT)objs/constraint_solver_wrap.$O
_pywrapcp.$(SHAREDLIBEXT): objs/constraint_solver_wrap.$O $(CP_LIBS) $(BASE_LIBS) $(LP_LIBS)
$(LD) $(LDOUT)_pywrapcp.$(SHAREDLIBEXT) objs/constraint_solver_wrap.$O $(CP_LIBS) $(LP_LIBS) $(BASE_LIBS) $(LDLPDEPS) $(LDFLAGS) $(PYTHON_LNK)
_pywrapcp.$(SHAREDLIBEXT): objs/constraint_solver_wrap.$O $(CP_LIBS) $(BASE_LIBS)
$(LD) $(LDOUT)_pywrapcp.$(SHAREDLIBEXT) objs/constraint_solver_wrap.$O $(CP_LIBS) $(BASE_LIBS) $(LDFLAGS) $(PYTHON_LNK)
ifeq "$(SYSTEM)" "win"
copy _pywrapcp.dll gen\\constraint_solver\\_pywrapcp.pyd
endif

3
constraint_solver/constraint_solver.h
View File

@@ -1641,11 +1641,12 @@ class Solver {
SymmetryBreaker* const v4);
// ----- Simplex Connection -----
#if !defined(SWIG)
SearchMonitor* MakeSimplexConnection(Callback1<MPSolver*>* const builder,
Callback1<MPSolver*>* const modifier,
Callback1<MPSolver*>* const runner,
int simplex_frequency);
#endif
// ----- Search Decicions and Decision Builders -----