Module: ppl/ppl Branch: pip Commit: fe3d8d0b4d10bc3239e3d3967d151650162ce101 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fe3d8d0b4d10b...

Author: Patricia Hill p.m.hill@leeds.ac.uk Date: Wed Oct 7 17:05:22 2009 +0100

Commented PIP_Problem code in the C interface that requires methods in the C++ interface that are not yet implemented.

Added declarations for printing the PIP_Problem and PIP_Tree in the tests.

---

interfaces/C/ppl_c_implementation_common.cc | 8 ++++---- interfaces/C/tests/print_to_buffer.c | 2 ++ interfaces/C/tests/print_to_buffer.h | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index c30555f..bac5f38 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -2115,7 +2115,7 @@ ppl_delete_PIP_Problem(ppl_const_PIP_Problem_t pip) try { return 0; } CATCH_ALL - +/* int ppl_assign_PIP_Problem_from_PIP_Problem(ppl_PIP_Problem_t dst, ppl_const_PIP_Problem_t src) try { @@ -2125,7 +2125,7 @@ ppl_assign_PIP_Problem_from_PIP_Problem(ppl_PIP_Problem_t dst, return 0; } CATCH_ALL - +*/ int ppl_PIP_Problem_space_dimension(ppl_const_PIP_Problem_t pip, ppl_dimension_type* m) try { @@ -2180,13 +2180,13 @@ ppl_PIP_Problem_constraint_at_index(ppl_const_PIP_Problem_t pip, } CATCH_ALL

+/* int ppl_PIP_Problem_clear(ppl_PIP_Problem_t pip) try { to_nonconst(pip)->clear(); return 0; } CATCH_ALL - int ppl_PIP_Problem_add_constraint(ppl_PIP_Problem_t pip, ppl_const_Constraint_t c) try { @@ -2212,7 +2212,7 @@ ppl_PIP_Problem_is_satisfiable(ppl_const_PIP_Problem_t pip) try { return to_const(pip)->is_satisfiable() ? 1 : 0; } CATCH_ALL - +*/ int ppl_PIP_Problem_solve(ppl_const_PIP_Problem_t pip) try { return to_const(pip)->solve(); diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c index bac2557..2c5a3f5 100644 --- a/interfaces/C/tests/print_to_buffer.c +++ b/interfaces/C/tests/print_to_buffer.c @@ -63,3 +63,5 @@ DEFINE_PRINT_TO_BUFFER(Grid_Generator) DEFINE_PRINT_TO_BUFFER(Grid_Generator_System)

DEFINE_PRINT_TO_BUFFER(MIP_Problem) + +DEFINE_PRINT_TO_BUFFER(PIP_Problem) diff --git a/interfaces/C/tests/print_to_buffer.h b/interfaces/C/tests/print_to_buffer.h index e1ed2b2..a80e523 100644 --- a/interfaces/C/tests/print_to_buffer.h +++ b/interfaces/C/tests/print_to_buffer.h @@ -70,6 +70,8 @@ DECLARE_PRINT_TO_BUFFER(Grid_Generator_System)

DECLARE_PRINT_TO_BUFFER(MIP_Problem)

+DECLARE_PRINT_TO_BUFFER(PIP_Problem) + #ifdef __cplusplus } /* extern "C" */ #endif