diff --git a/.hgtags b/.hgtags index ca9fb10f9cf39491ba19a7ed4d44f6587a017b51_LmhndGFncw==..63430a82aaf88e7b5ce49ff60aafee65b43d0360_LmhndGFncw== 100644 --- a/.hgtags +++ b/.hgtags @@ -41,3 +41,5 @@ bf6e2008180dab292fe49c70a47883852fb8d46b rql-debian-version-0.22.2-1 42004883d4cd6b42f7898a93df8537d5b87a662d rql-version-0.23.0 7dd29e42751ebebae4b50126dfb2071d9b2e8de1 rql-debian-version-0.23.0-1 +5cb31b7a463ea8fcc56da4e768648a2f818ec0ee rql-version-0.24.0 +4f8562728585d53053e914171180e623e73ac235 rql-debian-version-0.24.0-1 diff --git a/__pkginfo__.py b/__pkginfo__.py index ca9fb10f9cf39491ba19a7ed4d44f6587a017b51_X19wa2dpbmZvX18ucHk=..63430a82aaf88e7b5ce49ff60aafee65b43d0360_X19wa2dpbmZvX18ucHk= 100644 --- a/__pkginfo__.py +++ b/__pkginfo__.py @@ -52,11 +52,10 @@ if sys.platform != 'win32': ext_modules = [Extension('rql_solve', ['gecode_solver.cpp'], - libraries=['gecodeint', 'gecodekernel', - 'gecodesearch','gecodesupport'], + libraries=['gecodeint', 'gecodekernel', 'gecodesearch',], extra_compile_args=['-DGE_VERSION=%s' % GECODE_VERSION], ) ] else: ext_modules = [ Extension('rql_solve', ['gecode_solver.cpp'], @@ -57,11 +56,10 @@ extra_compile_args=['-DGE_VERSION=%s' % GECODE_VERSION], ) ] else: ext_modules = [ Extension('rql_solve', ['gecode_solver.cpp'], - libraries=['gecodeint', 'gecodekernel', - 'gecodesearch','gecodesupport'], + libraries=['gecodeint', 'gecodekernel', 'gecodesearch',], extra_compile_args=['-DGE_VERSION=%s' % GECODE_VERSION], extra_link_args=['-static-libgcc'], ) diff --git a/gecode_solver.cpp b/gecode_solver.cpp index ca9fb10f9cf39491ba19a7ed4d44f6587a017b51_Z2Vjb2RlX3NvbHZlci5jcHA=..63430a82aaf88e7b5ce49ff60aafee65b43d0360_Z2Vjb2RlX3NvbHZlci5jcHA= 100644 --- a/gecode_solver.cpp +++ b/gecode_solver.cpp @@ -365,4 +365,5 @@ unsigned int n_b = 0; if (s->status() != SS_FAILED) { n_p = s->propagators(); +#if GE_VERSION<PM_VERSION(3,2,0) n_b = s->branchings(); @@ -368,4 +369,7 @@ n_b = s->branchings(); +#else + n_b = s->branchers(); +#endif } #if GE_VERSION<PM_VERSION(2,0,0) Engine<RqlSolver> e(s);