June 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added explanation on the use of lcov to produce coverage information.
by Enea Zaffanella 11 Jun '09

11 Jun '09

Module: ppl/ppl Branch: master Commit: ed61e6fdbf3c3595b223cda8d955a93f13011692 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ed61e6fdbf3c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Jun 11 10:56:06 2009 +0200 Added explanation on the use of lcov to produce coverage information. --- STANDARDS | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 4 deletions(-) diff --git a/STANDARDS b/STANDARDS index cebaa8a..43654aa 100644 --- a/STANDARDS +++ b/STANDARDS @@ -559,8 +559,13 @@ o Refer to the existing tests for examples. Many tests are written along o Ideally the tests should exercise every line of code in the library. To help ensure that, the test-coverage facilities provided by GCC are very useful. They are described in Chapter 9 of the GCC manual - ("`gcov'---a Test Coverage Program"). For a shorter introduction, - the build tree under test must be configured with the + ("`gcov'---a Test Coverage Program"). For a simpler user interaction + with gcov, also including the generation of nicer HTML output, the + adoption of `lcov' is recommended (LCOV, the Linux Test Project GCOV + extension, http://ltp.sourceforge.net/coverage/lcov.php). + Here we summarize the steps needed to produce coverage information + using `lcov' (see below for a few hints on the direct use of `gcov'). + The build tree under test must be configured with the `--enable-coverage' and `--disable-optimization options' (and possibly also with --enable-profiling). For example: @@ -570,8 +575,51 @@ o Ideally the tests should exercise every line of code in the library. Running the tests (with `make check') produces many .gcno and .gcda files in src/.libs and in the test directories. These are data - files for the `gcov' program. The `gcov' program produces coverage - information. For example: + files for the `gcov' program. All the coverage data produced can be + automatically collected by `lcov' using the following command: + + $ lcov --directory . --capture --output-file ppl-lcov.info + + To generate HTML pages with the graphical view of the captured data, + use the `genhtml' command: + + $ genhtml ppl-lcov.info --output-directory ppl-lcov-html + + Coverage info can now be seen by pointing your favorite browser to + file ppl-lcov-html/index.html. The annotated sources will look like + the following (plus color information), where the value on the left + hand side of the colon is the number of executions of the corresponding + line of code (see also below on the use of coverage counters): + + 1636 : PPL_DIRTY_TEMP(N, sum); + 9828 : for (dimension_type k = num_dimensions + 1; k-- > 0; ) { + 6556 : const DB_Row<N>& x_dbm_k = x.dbm[k]; + 39648 : for (dimension_type i = num_dimensions + 1; i-- > 0; ) { + 26536 : DB_Row<N>& x_dbm_i = x.dbm[i]; + 26536 : const N& x_dbm_i_k = x_dbm_i[k]; + 26536 : if (!is_plus_infinity(x_dbm_i_k)) + 55128 : for (dimension_type j = num_dimensions + 1; j-- > 0; ) { + 36904 : const N& x_dbm_k_j = x_dbm_k[j]; + 36904 : if (!is_plus_infinity(x_dbm_k_j)) { + : // Rounding upward for correctness. + 12136 : add_assign_r(sum, x_dbm_i_k, x_dbm_k_j, ROUND_UP); + 12136 : min_assign(x_dbm_i[j], sum); + : } + : } + : } + : } + + Note that the collection of coverage information is incremental: + running again any tests will add to coverage counters (in order + to see the changes, coverage data has to be re-captured using the + `lcov' command and HTML pages re-generated using the `genhtml' command). + Coverage counters can be reset to zero by issuing the command: + + $ lcov --directory . --zerocounters + + As said above, `lcov' is just a wrapper on top of `gcov'. The direct + use of `gcov' produces plain-text based coverage information. + For example: $ cd src $ gcov -o .libs Grid_public.cc @@ -613,3 +661,4 @@ o Ideally the tests should exercise every line of code in the library. -: 1015: // All checks passed. 48245: 1016: return true; -: 1017:} +

1 0

[GIT] ppl/ppl(master): Add -lgcov to extra_libraries when configuring with coverage enabled.
by Enea Zaffanella 11 Jun '09

11 Jun '09

Module: ppl/ppl Branch: master Commit: 6eb78d62f22482b0fd5fbc0f63fe567aafa9f257 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6eb78d62f224… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Jun 11 00:25:38 2009 +0200 Add -lgcov to extra_libraries when configuring with coverage enabled. Fixes a link bug when trying to compute coverage for the OCaml interface tests. --- configure.ac | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 0e13e32..af6ee86 100644 --- a/configure.ac +++ b/configure.ac @@ -241,6 +241,7 @@ yes) AC_MSG_RESULT(yes) OPT_FLAGS="-g" COMP_FLAGS="$COMP_FLAGS -fprofile-arcs -ftest-coverage" + extra_libraries="${extra_libraries} -lgcov" ;; no) AC_MSG_RESULT(no)

1 0

[GIT] ppl/ppl(master): Avoid unused variable warning when assertions are not enabled.
by Patricia Hill 10 Jun '09

10 Jun '09

Module: ppl/ppl Branch: master Commit: 01628113e5409dae8b2ce265ae83368d95ca8df1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=01628113e540… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Jun 10 11:40:06 2009 +0100 Avoid unused variable warning when assertions are not enabled. --- src/Box.templates.hh | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 9918363..981c0a4 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -2138,7 +2138,7 @@ template <typename ITV> void Box<ITV>::refine_no_check(const Constraint& c) { const dimension_type c_space_dim = c.space_dimension(); - assert(c_space_dim <= space_dimension()); + assert(c.space_dimension() <= space_dimension()); assert(!marked_empty()); dimension_type c_num_vars = 0; @@ -2179,8 +2179,7 @@ void Box<ITV>::refine_no_check(const Congruence& cg) { assert(!marked_empty()); - const dimension_type cg_space_dim = cg.space_dimension(); - assert(cg_space_dim <= space_dimension()); + assert(cg.space_dimension() <= space_dimension()); if (cg.is_proper_congruence()) { // FIXME: also deal with the case of interval with restrictions.

1 0

[GIT] ppl/ppl(floating_point): In the Java tests, be more systematic in the use of method free().
by Enea Zaffanella 10 Jun '09

10 Jun '09

Module: ppl/ppl Branch: floating_point Commit: 7ded610ca27bc6a4ddd60fc38582fee4adc66f23 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7ded610ca27b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Jun 2 11:05:25 2009 +0200 In the Java tests, be more systematic in the use of method free(). --- .../ppl_interface_generator_java_test_java_code.m4 | 97 ++++++++++++++++++-- 1 files changed, 89 insertions(+), 8 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=7ded610c…

1 0

[GIT] ppl/ppl(floating_point): Interface for Java class Linear_Expression_Times improved.
by Enea Zaffanella 10 Jun '09

10 Jun '09

Module: ppl/ppl Branch: floating_point Commit: 81e8a397938b2a0e20787581c68dcc8fd0799e89 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=81e8a397938b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Jun 2 11:00:09 2009 +0200 Interface for Java class Linear_Expression_Times improved. The misleading methods left_hand_side() and right_hand_side() replaced by: public Coefficient coefficient(); and public Linear_Expression linear_expression(); returing the two object factors using clearer naming. --- interfaces/Java/jni/ppl_java_common.cc | 46 ++++++++----------- interfaces/Java/jni/ppl_java_common.defs.hh | 4 +- interfaces/Java/jni/ppl_java_globals.cc | 10 ++-- .../Linear_Expression_Times.java | 36 +++++++++------ 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index d2b9675..9c82657 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -616,65 +616,57 @@ build_cxx_constraint(JNIEnv* env, jobject j_constraint) { Linear_Expression build_cxx_linear_expression(JNIEnv* env, jobject j_le) { + jfieldID fID; jclass current_class = env->GetObjectClass(j_le); // LE_Variable if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Variable)) { - jint var_id - = env->CallIntMethod(j_le, - cached_FMIDs.Linear_Expression_Variable_var_id_ID); + jmethodID mID = cached_FMIDs.Linear_Expression_Variable_var_id_ID; + jint var_id = env->CallIntMethod(j_le, mID); return Linear_Expression(Variable(var_id)); } // LE_Coefficient if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Coefficient)) { - jfieldID fID = cached_FMIDs.Linear_Expression_Coefficient_coeff_ID; + fID = cached_FMIDs.Linear_Expression_Coefficient_coeff_ID; jobject ppl_coeff = env->GetObjectField(j_le, fID); return Linear_Expression(build_cxx_coeff(env, ppl_coeff)); } // LE_Sum if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Sum)) { - jobject l_value - = env->GetObjectField(j_le, cached_FMIDs.Linear_Expression_Sum_lhs_ID); - jobject r_value - = env->GetObjectField(j_le, cached_FMIDs.Linear_Expression_Sum_rhs_ID); + fID = cached_FMIDs.Linear_Expression_Sum_lhs_ID; + jobject l_value = env->GetObjectField(j_le, fID); + fID = cached_FMIDs.Linear_Expression_Sum_rhs_ID; + jobject r_value = env->GetObjectField(j_le, fID); return build_cxx_linear_expression(env, l_value) + build_cxx_linear_expression(env, r_value); } // LE_Times if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Times)) { - jobject le_coeff_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Times_lhs_ID); - jobject ppl_coeff - = env->GetObjectField(le_coeff_value, - cached_FMIDs.Linear_Expression_Coefficient_coeff_ID); - jobject le_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Times_rhs_ID); - return build_cxx_coeff(env, ppl_coeff) + fID = cached_FMIDs.Linear_Expression_Times_coeff_ID; + jobject coeff_value = env->GetObjectField(j_le, fID); + fID = cached_FMIDs.Linear_Expression_Times_lin_expr_ID; + jobject le_value = env->GetObjectField(j_le, fID); + return build_cxx_coeff(env, coeff_value) * build_cxx_linear_expression(env, le_value); } // LE_Difference if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Difference)) { - jobject l_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Difference_lhs_ID); - jobject r_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Difference_rhs_ID); + fID = cached_FMIDs.Linear_Expression_Difference_lhs_ID; + jobject l_value = env->GetObjectField(j_le,fID); + fID = cached_FMIDs.Linear_Expression_Difference_rhs_ID; + jobject r_value = env->GetObjectField(j_le, fID); return build_cxx_linear_expression(env, l_value) - build_cxx_linear_expression(env, r_value); } // LE_Unary_Minus if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Unary_Minus)) { - jobject le_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Unary_Minus_arg_ID); + fID = cached_FMIDs.Linear_Expression_Unary_Minus_arg_ID; + jobject le_value = env->GetObjectField(j_le, fID); return -build_cxx_linear_expression(env, le_value); } assert(false); diff --git a/interfaces/Java/jni/ppl_java_common.defs.hh b/interfaces/Java/jni/ppl_java_common.defs.hh index 6c52441..6a9399e 100644 --- a/interfaces/Java/jni/ppl_java_common.defs.hh +++ b/interfaces/Java/jni/ppl_java_common.defs.hh @@ -302,8 +302,8 @@ struct Java_FMID_Cache { jfieldID Linear_Expression_Difference_rhs_ID; jfieldID Linear_Expression_Sum_lhs_ID; jfieldID Linear_Expression_Sum_rhs_ID; - jfieldID Linear_Expression_Times_lhs_ID; - jfieldID Linear_Expression_Times_rhs_ID; + jfieldID Linear_Expression_Times_coeff_ID; + jfieldID Linear_Expression_Times_lin_expr_ID; jmethodID Linear_Expression_Times_init_from_coeff_var_ID; jfieldID Linear_Expression_Unary_Minus_arg_ID; jmethodID Linear_Expression_Variable_init_ID; diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 071d4c1..e1d296c 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -408,14 +408,14 @@ JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_Linear_1Expression_1Times_initIDs (JNIEnv* env, jclass j_le_times_class) { jfieldID fID; - fID = env->GetFieldID(j_le_times_class, "lhs", - "Lparma_polyhedra_library/Linear_Expression_Coefficient;"); + fID = env->GetFieldID(j_le_times_class, "coeff", + "Lparma_polyhedra_library/Coefficient;"); CHECK_RESULT_ASSERT(env, fID); - cached_FMIDs.Linear_Expression_Times_lhs_ID = fID; - fID = env->GetFieldID(j_le_times_class, "rhs", + cached_FMIDs.Linear_Expression_Times_coeff_ID = fID; + fID = env->GetFieldID(j_le_times_class, "lin_expr", "Lparma_polyhedra_library/Linear_Expression;"); CHECK_RESULT_ASSERT(env, fID); - cached_FMIDs.Linear_Expression_Times_rhs_ID = fID; + cached_FMIDs.Linear_Expression_Times_lin_expr_ID = fID; jmethodID mID; mID = env->GetMethodID(j_le_times_class, "<init>", "(Lparma_polyhedra_library/Coefficient;" diff --git a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java index 44f6cc4..dc69ccd 100644 --- a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java +++ b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java @@ -27,37 +27,43 @@ package parma_polyhedra_library; public class Linear_Expression_Times extends Linear_Expression { - //! The value of the left hand side of \p this. - protected Linear_Expression_Coefficient lhs; + //! The value of the coefficient. + protected Coefficient coeff; - //! The value of the left hand side of \p this. - protected Linear_Expression rhs; + //! The value of the inner linear expression. + protected Linear_Expression lin_expr; //! Builds an object cloning the input arguments. public Linear_Expression_Times(Coefficient c, Variable v) { - lhs = new Linear_Expression_Coefficient(c); - rhs = new Linear_Expression_Variable(v); + coeff = new Coefficient(c); + lin_expr = new Linear_Expression_Variable(v); + } + + //! Builds an object cloning the input arguments. + public Linear_Expression_Times(Coefficient c, Linear_Expression l) { + coeff = new Coefficient(c); + lin_expr = l.clone(); } //! Builds an object cloning the input arguments. public Linear_Expression_Times(Linear_Expression l, Coefficient c) { - lhs = new Linear_Expression_Coefficient(c); - rhs = l.clone(); + coeff = new Coefficient(c); + lin_expr = l.clone(); } - //! Returns the left hand side of \p this. - public Linear_Expression left_hand_side() { - return lhs; + //! Returns the coefficient of \p this. + public Coefficient coefficient() { + return coeff; } - //! Returns the right hand side of \p this. - public Linear_Expression right_hand_side() { - return rhs; + //! Returns the linear expression subobject of \p this. + public Linear_Expression linear_expression() { + return lin_expr; } //! Builds a copy of this. public Linear_Expression_Times clone() { - return new Linear_Expression_Times(rhs, lhs.argument()); + return new Linear_Expression_Times(coeff, lin_expr); } private static native void initIDs();

1 0

[GIT] ppl/ppl(floating_point): Test test02() overflows with 16 bit checked integers.
by Enea Zaffanella 10 Jun '09

10 Jun '09

Module: ppl/ppl Branch: floating_point Commit: 7a810826f459bd918da77b554c632fe6f909829f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7a810826f459… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed May 20 13:16:36 2009 +0200 Test test02() overflows with 16 bit checked integers. --- tests/Polyhedron/wrap2.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Polyhedron/wrap2.cc b/tests/Polyhedron/wrap2.cc index 363c28f..ca9e8dd 100644 --- a/tests/Polyhedron/wrap2.cc +++ b/tests/Polyhedron/wrap2.cc @@ -94,5 +94,5 @@ test02() { BEGIN_MAIN DO_TEST_F8(test01); - DO_TEST_F8(test02); + DO_TEST_F16(test02); END_MAIN

1 0

[Fwd: GCC 4.5.0 Status Report (2009-06-04)]
by Roberto Bagnara 06 Jun '09

06 Jun '09

-------- Original Message -------- Subject: GCC 4.5.0 Status Report (2009-06-04) Date: Thu, 4 Jun 2009 13:45:17 +0200 (CEST) From: Richard Guenther <rguenther(a)suse.de> To: gcc(a)gcc.gnu.org Status ====== The trunk is in Stage 1. As previously stated, we expect that Stage 1 will last through at least July. There are still large pending merges we are aware of, specifically the VTA and LTO branches will be considered when deciding when to go to Stage 3. We hope to see you all at this years GCC Summit. Quality Data ============ Priority # Change from Last Report -------- --- ----------------------- P1 15 - 1 P2 92 + 9 P3 0 - 1 -------- --- ----------------------- Total 107 + 7 Previous Report =============== http://gcc.gnu.org/ml/gcc/2009-05/msg00092.html The next report for 4.5.0 will be sent by Jakub. -- Richard Guenther <rguenther(a)suse.de> Novell / SUSE Labs SUSE LINUX Products GmbH - Nuernberg - AG Nuernberg - HRB 16746 - GF: Markus Rex -- Prof. Roberto Bagnara Computer Science Group Department of Mathematics, University of Parma, Italy http://www.cs.unipr.it/~bagnara/ mailto:bagnara@cs.unipr.it

1 0

[GIT] ppl/ppl(master): In the Java tests, be more systematic in the use of method free().
by Enea Zaffanella 02 Jun '09

02 Jun '09

Module: ppl/ppl Branch: master Commit: 7ded610ca27bc6a4ddd60fc38582fee4adc66f23 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7ded610ca27b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Jun 2 11:05:25 2009 +0200 In the Java tests, be more systematic in the use of method free(). --- .../ppl_interface_generator_java_test_java_code.m4 | 97 ++++++++++++++++++-- 1 files changed, 89 insertions(+), 8 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=7ded610c…

1 0

[GIT] ppl/ppl(master): Interface for Java class Linear_Expression_Times improved.
by Enea Zaffanella 02 Jun '09

02 Jun '09

Module: ppl/ppl Branch: master Commit: 81e8a397938b2a0e20787581c68dcc8fd0799e89 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=81e8a397938b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Jun 2 11:00:09 2009 +0200 Interface for Java class Linear_Expression_Times improved. The misleading methods left_hand_side() and right_hand_side() replaced by: public Coefficient coefficient(); and public Linear_Expression linear_expression(); returing the two object factors using clearer naming. --- interfaces/Java/jni/ppl_java_common.cc | 46 ++++++++----------- interfaces/Java/jni/ppl_java_common.defs.hh | 4 +- interfaces/Java/jni/ppl_java_globals.cc | 10 ++-- .../Linear_Expression_Times.java | 36 +++++++++------ 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index d2b9675..9c82657 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -616,65 +616,57 @@ build_cxx_constraint(JNIEnv* env, jobject j_constraint) { Linear_Expression build_cxx_linear_expression(JNIEnv* env, jobject j_le) { + jfieldID fID; jclass current_class = env->GetObjectClass(j_le); // LE_Variable if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Variable)) { - jint var_id - = env->CallIntMethod(j_le, - cached_FMIDs.Linear_Expression_Variable_var_id_ID); + jmethodID mID = cached_FMIDs.Linear_Expression_Variable_var_id_ID; + jint var_id = env->CallIntMethod(j_le, mID); return Linear_Expression(Variable(var_id)); } // LE_Coefficient if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Coefficient)) { - jfieldID fID = cached_FMIDs.Linear_Expression_Coefficient_coeff_ID; + fID = cached_FMIDs.Linear_Expression_Coefficient_coeff_ID; jobject ppl_coeff = env->GetObjectField(j_le, fID); return Linear_Expression(build_cxx_coeff(env, ppl_coeff)); } // LE_Sum if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Sum)) { - jobject l_value - = env->GetObjectField(j_le, cached_FMIDs.Linear_Expression_Sum_lhs_ID); - jobject r_value - = env->GetObjectField(j_le, cached_FMIDs.Linear_Expression_Sum_rhs_ID); + fID = cached_FMIDs.Linear_Expression_Sum_lhs_ID; + jobject l_value = env->GetObjectField(j_le, fID); + fID = cached_FMIDs.Linear_Expression_Sum_rhs_ID; + jobject r_value = env->GetObjectField(j_le, fID); return build_cxx_linear_expression(env, l_value) + build_cxx_linear_expression(env, r_value); } // LE_Times if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Times)) { - jobject le_coeff_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Times_lhs_ID); - jobject ppl_coeff - = env->GetObjectField(le_coeff_value, - cached_FMIDs.Linear_Expression_Coefficient_coeff_ID); - jobject le_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Times_rhs_ID); - return build_cxx_coeff(env, ppl_coeff) + fID = cached_FMIDs.Linear_Expression_Times_coeff_ID; + jobject coeff_value = env->GetObjectField(j_le, fID); + fID = cached_FMIDs.Linear_Expression_Times_lin_expr_ID; + jobject le_value = env->GetObjectField(j_le, fID); + return build_cxx_coeff(env, coeff_value) * build_cxx_linear_expression(env, le_value); } // LE_Difference if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Difference)) { - jobject l_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Difference_lhs_ID); - jobject r_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Difference_rhs_ID); + fID = cached_FMIDs.Linear_Expression_Difference_lhs_ID; + jobject l_value = env->GetObjectField(j_le,fID); + fID = cached_FMIDs.Linear_Expression_Difference_rhs_ID; + jobject r_value = env->GetObjectField(j_le, fID); return build_cxx_linear_expression(env, l_value) - build_cxx_linear_expression(env, r_value); } // LE_Unary_Minus if (env->IsAssignableFrom(current_class, cached_classes.Linear_Expression_Unary_Minus)) { - jobject le_value - = env->GetObjectField(j_le, - cached_FMIDs.Linear_Expression_Unary_Minus_arg_ID); + fID = cached_FMIDs.Linear_Expression_Unary_Minus_arg_ID; + jobject le_value = env->GetObjectField(j_le, fID); return -build_cxx_linear_expression(env, le_value); } assert(false); diff --git a/interfaces/Java/jni/ppl_java_common.defs.hh b/interfaces/Java/jni/ppl_java_common.defs.hh index 6c52441..6a9399e 100644 --- a/interfaces/Java/jni/ppl_java_common.defs.hh +++ b/interfaces/Java/jni/ppl_java_common.defs.hh @@ -302,8 +302,8 @@ struct Java_FMID_Cache { jfieldID Linear_Expression_Difference_rhs_ID; jfieldID Linear_Expression_Sum_lhs_ID; jfieldID Linear_Expression_Sum_rhs_ID; - jfieldID Linear_Expression_Times_lhs_ID; - jfieldID Linear_Expression_Times_rhs_ID; + jfieldID Linear_Expression_Times_coeff_ID; + jfieldID Linear_Expression_Times_lin_expr_ID; jmethodID Linear_Expression_Times_init_from_coeff_var_ID; jfieldID Linear_Expression_Unary_Minus_arg_ID; jmethodID Linear_Expression_Variable_init_ID; diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 071d4c1..e1d296c 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -408,14 +408,14 @@ JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_Linear_1Expression_1Times_initIDs (JNIEnv* env, jclass j_le_times_class) { jfieldID fID; - fID = env->GetFieldID(j_le_times_class, "lhs", - "Lparma_polyhedra_library/Linear_Expression_Coefficient;"); + fID = env->GetFieldID(j_le_times_class, "coeff", + "Lparma_polyhedra_library/Coefficient;"); CHECK_RESULT_ASSERT(env, fID); - cached_FMIDs.Linear_Expression_Times_lhs_ID = fID; - fID = env->GetFieldID(j_le_times_class, "rhs", + cached_FMIDs.Linear_Expression_Times_coeff_ID = fID; + fID = env->GetFieldID(j_le_times_class, "lin_expr", "Lparma_polyhedra_library/Linear_Expression;"); CHECK_RESULT_ASSERT(env, fID); - cached_FMIDs.Linear_Expression_Times_rhs_ID = fID; + cached_FMIDs.Linear_Expression_Times_lin_expr_ID = fID; jmethodID mID; mID = env->GetMethodID(j_le_times_class, "<init>", "(Lparma_polyhedra_library/Coefficient;" diff --git a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java index 44f6cc4..dc69ccd 100644 --- a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java +++ b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java @@ -27,37 +27,43 @@ package parma_polyhedra_library; public class Linear_Expression_Times extends Linear_Expression { - //! The value of the left hand side of \p this. - protected Linear_Expression_Coefficient lhs; + //! The value of the coefficient. + protected Coefficient coeff; - //! The value of the left hand side of \p this. - protected Linear_Expression rhs; + //! The value of the inner linear expression. + protected Linear_Expression lin_expr; //! Builds an object cloning the input arguments. public Linear_Expression_Times(Coefficient c, Variable v) { - lhs = new Linear_Expression_Coefficient(c); - rhs = new Linear_Expression_Variable(v); + coeff = new Coefficient(c); + lin_expr = new Linear_Expression_Variable(v); + } + + //! Builds an object cloning the input arguments. + public Linear_Expression_Times(Coefficient c, Linear_Expression l) { + coeff = new Coefficient(c); + lin_expr = l.clone(); } //! Builds an object cloning the input arguments. public Linear_Expression_Times(Linear_Expression l, Coefficient c) { - lhs = new Linear_Expression_Coefficient(c); - rhs = l.clone(); + coeff = new Coefficient(c); + lin_expr = l.clone(); } - //! Returns the left hand side of \p this. - public Linear_Expression left_hand_side() { - return lhs; + //! Returns the coefficient of \p this. + public Coefficient coefficient() { + return coeff; } - //! Returns the right hand side of \p this. - public Linear_Expression right_hand_side() { - return rhs; + //! Returns the linear expression subobject of \p this. + public Linear_Expression linear_expression() { + return lin_expr; } //! Builds a copy of this. public Linear_Expression_Times clone() { - return new Linear_Expression_Times(rhs, lhs.argument()); + return new Linear_Expression_Times(coeff, lin_expr); } private static native void initIDs();

1 0

Re: [PPL-devel] doxygen & bibliography
by Roberto Bagnara 02 Jun '09

02 Jun '09

delestre olivier wrote: > Dear professor Bagnara, > > I'm a phd student in applied mathematics at the university of Orléans > (France). I'm working on the simulation of rainfall overland flow on > agricultural fields. In order to do this I have developed a code in c++ > and I've done a documentation with doxygen. > > I would like to add a bibliography thanks to the latex possibilities. I > saw on the web that you answered to a forum dealing about this subject. > But, I am not able to get the script, so I would like to know if it is > possible to get it. > > > Thank you for your answer, > Olivier Delestre Hi Olivier, all the scripts we use for that purpose are here: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=tree;f=devtools;hb=HE… All the best, Roberto -- Prof. Roberto Bagnara Computer Science Group Department of Mathematics, University of Parma, Italy http://www.cs.unipr.it/~bagnara/ mailto:bagnara@cs.unipr.it

1 0