[PPL-devel] [GIT] ppl/ppl(master): Simplify function names in PIP_Tree_Node, matching

[Patricia Hill]

Module: ppl/ppl
Branch: master
Commit: 924d4fbdd9192a6b03c9fbea4c4e5f0d71411f96
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=924d4fbdd9192a6b03c9fbea4c4e5f0d71411f96

Author: Patricia Hill <p.m.hill at leeds.ac.uk>
Date:   Thu Apr  8 12:29:57 2010 +0100

Simplify function names in PIP_Tree_Node, matching
corresponding predicate names in Prolog interface.

---

 interfaces/OCaml/ppl_ocaml_common.cc   |    6 +++---
 interfaces/OCaml/ppl_ocaml_globals.ml  |   12 ++++++------
 interfaces/OCaml/ppl_ocaml_globals.mli |    6 +++---
 interfaces/OCaml/tests/test1.ml        |   10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc
index 9f3e8bf..291298b 100644
--- a/interfaces/OCaml/ppl_ocaml_common.cc
+++ b/interfaces/OCaml/ppl_ocaml_common.cc
@@ -1626,7 +1626,7 @@ CATCH_ALL
 
 extern "C"
 CAMLprim value
-ppl_PIP_Tree_Node_get_parametric_values(value caml_node,
+ppl_PIP_Tree_Node_parametric_values(value caml_node,
                                         value caml_dim) try {
   CAMLparam2(caml_node, caml_dim);
   const PIP_Tree_Node* ppl_node = p_PIP_Tree_Node_val(caml_node);
@@ -1647,7 +1647,7 @@ CATCH_ALL
 
 extern "C"
 CAMLprim value
-ppl_PIP_Tree_Node_get_true_child(value caml_node) try {
+ppl_PIP_Tree_Node_true_child(value caml_node) try {
   CAMLparam1(caml_node);
   const PIP_Tree_Node* ppl_node = p_PIP_Tree_Node_val(caml_node);
   const PIP_Tree_Node* child = ppl_PIP_Tree_Node_get_child(ppl_node, true);
@@ -1657,7 +1657,7 @@ CATCH_ALL
 
 extern "C"
 CAMLprim value
-ppl_PIP_Tree_Node_get_false_child(value caml_node) try {
+ppl_PIP_Tree_Node_false_child(value caml_node) try {
   CAMLparam1(caml_node);
   const PIP_Tree_Node* ppl_node = p_PIP_Tree_Node_val(caml_node);
   const PIP_Tree_Node* child = ppl_PIP_Tree_Node_get_child(ppl_node, false);
diff --git a/interfaces/OCaml/ppl_ocaml_globals.ml b/interfaces/OCaml/ppl_ocaml_globals.ml
index 5ce4c8f..3d1e7a4 100644
--- a/interfaces/OCaml/ppl_ocaml_globals.ml
+++ b/interfaces/OCaml/ppl_ocaml_globals.ml
@@ -414,18 +414,18 @@ external ppl_PIP_Tree_Node_is_solution:
   pip_tree_node -> bool
       = "ppl_PIP_Tree_Node_is_solution"
 
-external ppl_PIP_Tree_Node_get_parametric_values:
+external ppl_PIP_Tree_Node_parametric_values:
   pip_tree_node -> int -> linear_expression
-      = "ppl_PIP_Tree_Node_get_parametric_values"
+      = "ppl_PIP_Tree_Node_parametric_values"
 
 external ppl_PIP_Tree_Node_is_decision:
   pip_tree_node -> bool
       = "ppl_PIP_Tree_Node_is_decision"
 
-external ppl_PIP_Tree_Node_get_true_child:
+external ppl_PIP_Tree_Node_true_child:
   pip_tree_node -> pip_tree_node
-      = "ppl_PIP_Tree_Node_get_true_child"
+      = "ppl_PIP_Tree_Node_true_child"
 
-external ppl_PIP_Tree_Node_get_false_child:
+external ppl_PIP_Tree_Node_false_child:
   pip_tree_node -> pip_tree_node
-      = "ppl_PIP_Tree_Node_get_false_child"
+      = "ppl_PIP_Tree_Node_false_child"
diff --git a/interfaces/OCaml/ppl_ocaml_globals.mli b/interfaces/OCaml/ppl_ocaml_globals.mli
index e43b10c..8ffb016 100644
--- a/interfaces/OCaml/ppl_ocaml_globals.mli
+++ b/interfaces/OCaml/ppl_ocaml_globals.mli
@@ -356,14 +356,14 @@ val ppl_PIP_Tree_Node_is_bottom:
 val ppl_PIP_Tree_Node_is_solution:
   pip_tree_node -> bool
 
-val ppl_PIP_Tree_Node_get_parametric_values:
+val ppl_PIP_Tree_Node_parametric_values:
   pip_tree_node -> int -> linear_expression
 
 val ppl_PIP_Tree_Node_is_decision:
   pip_tree_node -> bool
 
-val ppl_PIP_Tree_Node_get_true_child:
+val ppl_PIP_Tree_Node_true_child:
   pip_tree_node -> pip_tree_node
 
-val ppl_PIP_Tree_Node_get_false_child:
+val ppl_PIP_Tree_Node_false_child:
   pip_tree_node -> pip_tree_node
diff --git a/interfaces/OCaml/tests/test1.ml b/interfaces/OCaml/tests/test1.ml
index dcf8ac4..66d6b8a 100644
--- a/interfaces/OCaml/tests/test1.ml
+++ b/interfaces/OCaml/tests/test1.ml
@@ -597,21 +597,21 @@ let out = if (ppl_PIP_Tree_Node_artificials node = [])
     in (print_string_if_noisy out);;
 print_string_if_noisy "\n";;
 let _node_cs = ppl_PIP_Tree_Node_constraints node;;
-let tchild = ppl_PIP_Tree_Node_get_true_child node;;
-let _fchild = ppl_PIP_Tree_Node_get_false_child node;;
+let tchild = ppl_PIP_Tree_Node_true_child node;;
+let _fchild = ppl_PIP_Tree_Node_false_child node;;
 let out = if (ppl_PIP_Tree_Node_is_decision tchild)
   then "ppl_PIP_Tree_Node_is_decision tchild test succeeded"
   else "ppl_PIP_Tree_Node_is_decision tchild test failed"
     in (print_string_if_noisy out);;
 print_string_if_noisy "\n";;
-let ttchild = ppl_PIP_Tree_Node_get_true_child tchild;;
-let ftchild = ppl_PIP_Tree_Node_get_false_child tchild;;
+let ttchild = ppl_PIP_Tree_Node_true_child tchild;;
+let ftchild = ppl_PIP_Tree_Node_false_child tchild;;
 let out = if (ppl_PIP_Tree_Node_is_solution ttchild)
   then "ppl_PIP_Tree_Node_is_decision ttchild test succeeded"
   else "ppl_PIP_Tree_Node_is_decision ttchild test failed"
     in (print_string_if_noisy out);;
 print_string_if_noisy "\n";;
-let _par_vals = ppl_PIP_Tree_Node_get_parametric_values ttchild 0;;
+let _par_vals = ppl_PIP_Tree_Node_parametric_values ttchild 0;;
 let _ftchild_arts = ppl_PIP_Tree_Node_artificials ftchild;;
 
 (* Pointset_Powerset_Grid is not enabled by default, the following code is *)