March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Man pages updated.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: 16d6cc4da3ab314764c14dcb245e9ac4e8fcc32d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=16d6cc4da3ab… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 18:35:09 2009 +0100 Man pages updated. --- demos/ppl_lpsol/ppl_lpsol.1 | 2 +- doc/ppl-config.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demos/ppl_lpsol/ppl_lpsol.1 b/demos/ppl_lpsol/ppl_lpsol.1 index 8dc9caf..3925f08 100644 --- a/demos/ppl_lpsol/ppl_lpsol.1 +++ b/demos/ppl_lpsol/ppl_lpsol.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH PPL_LPSOL "1" "November 2008" "ppl_lpsol 0.10.1" "User Commands" +.TH PPL_LPSOL "1" "April 2009" "ppl_lpsol 0.10.1" "User Commands" .SH NAME ppl_lpsol \- a PPL-based mixed integer programming problem solver .SH SYNOPSIS diff --git a/doc/ppl-config.1 b/doc/ppl-config.1 index 90b2f28..ef18a8e 100644 --- a/doc/ppl-config.1 +++ b/doc/ppl-config.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH PPL-CONFIG "1" "November 2008" "ppl-config 0.10.1" "User Commands" +.TH PPL-CONFIG "1" "April 2009" "ppl-config 0.10.1" "User Commands" .SH NAME ppl-config \- obtain information about an installation of the Parma Polyhedra Library .SH SYNOPSIS

1 0

[GIT] ppl/ppl(master): The `ppl_lcdd' program can now be built and checked with cross-compilation.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: 6903cbf2427c64a4d7810286f901a363d3717cb2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6903cbf2427c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 18:34:15 2009 +0100 The `ppl_lcdd' program can now be built and checked with cross-compilation. --- demos/ppl_lcdd/Makefile.am | 9 +++++---- demos/ppl_lcdd/ppl_lcdd.1 | 5 ++++- demos/ppl_lcdd/ppl_lcdd.cc | 26 +++++++++++++++++++++++++- demos/ppl_lcdd/ppl_lcdd_extra_man_text | 4 ++++ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/demos/ppl_lcdd/Makefile.am b/demos/ppl_lcdd/Makefile.am index 2a93f72..e038e0d 100644 --- a/demos/ppl_lcdd/Makefile.am +++ b/demos/ppl_lcdd/Makefile.am @@ -104,7 +104,7 @@ mit71-61.ine \ mit90-86.ine \ $(TOUGH_EXAMPLES_IF_ASSERTIONS_ENABLED) -check-local: ppl_lcdd +check-local: ppl_lcdd$(EXEEXT) echo $(TOUGH_EXAMPLES) >tough_examples echo $(ECHO_N) "$(ECHO_C)" >obtained LANG=C; \ @@ -113,10 +113,11 @@ check-local: ppl_lcdd file=`basename $$path`; \ $(FGREP) $$file tough_examples >/dev/null 2>&1 && continue; \ echo $(ECHO_N) $$file " $(ECHO_C)" >>obtained; \ - echo ppl_lcdd $$path; \ - ./ppl_lcdd $$path | $(TEXT_MD5SUM) >>obtained; \ + echo ppl_lcdd$(EXEEXT) $$path; \ + ./ppl_lcdd$(EXEEXT) $$path | tr -d '\015' | $(TEXT_MD5SUM) \ + >>obtained; \ done - diff -u $(srcdir)/$(EXPECTED) obtained + diff obtained $(srcdir)/$(EXPECTED) MOSTLYCLEANFILES = \ tough_examples \ diff --git a/demos/ppl_lcdd/ppl_lcdd.1 b/demos/ppl_lcdd/ppl_lcdd.1 index d73a78f..f460191 100644 --- a/demos/ppl_lcdd/ppl_lcdd.1 +++ b/demos/ppl_lcdd/ppl_lcdd.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH PPL_LCDD "1" "November 2008" "ppl_lcdd 0.10.1" "User Commands" +.TH PPL_LCDD "1" "April 2009" "ppl_lcdd 0.10.1" "User Commands" .SH NAME ppl_lcdd \- a PPL-based program for vertex/facet enumeration of convex polyhedra .SH SYNOPSIS @@ -41,6 +41,9 @@ checks if the result is equal to what is in PATH .SH AVAILABILITY The latest version of the Parma Polyhedra Library and all the documentation is available at \fBhttp://www.cs.unipr.it/ppl/\fR . +.SH NOTES +The option \fB\-CSECS\fR (\fB\-\-max\-cpu\fR=\fISECS\fR) is not available +on some platforms. .SH AUTHOR See the file \fBCREDITS\fR in the source distribution or use the command \fBppl\-config \-\-credits\fR for a list of contributors. diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index 5439ddd..19d7889 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -124,6 +124,11 @@ typedef Polyhedron* POLYHEDRON_TYPE; # include <sys/resource.h> #endif +#if defined(PPL_HAVE_SYS_RESOURCE_H) \ + && (defined(SA_ONESHOT) || defined(SA_RESETHAND)) +#define PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME +#endif + namespace { #ifdef PPL_HAVE_GETOPT_H @@ -148,7 +153,9 @@ static const char* usage_string "and generates a V-representation (resp., an H-representation) of\n" "the same polyhedron.\n\n" "Options:\n" +#ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME " -CSECS, --max-cpu=SECS limits CPU usage to SECS seconds\n" +#endif " -RMB, --max-memory=MB limits memory usage to MB megabytes\n" " -h, --help prints this help text to stdout\n" " -oPATH, --output=PATH appends output to PATH\n" @@ -173,7 +180,12 @@ static const char* usage_string const char* program_name = 0; +#ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME + unsigned long max_seconds_of_cpu_time = 0; + +#endif + unsigned long max_bytes_of_virtual_memory = 0; bool print_timings = false; bool verbose = false; @@ -269,6 +281,8 @@ warning(const char* format, ...) { va_end(ap); } +#ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME + extern "C" typedef void (*sig_handler_type)(int); void @@ -284,7 +298,7 @@ set_alarm_on_cpu_time(const unsigned seconds, sig_handler_type handler) { #elif defined(SA_RESETHAND) s.sa_flags = SA_RESETHAND; #else - #error "Either SA_ONESHOT or SA_RESETHAND must be defined." +#error "Either SA_ONESHOT or SA_RESETHAND must be defined." #endif if (sigaction(SIGXCPU, &s, 0) != 0) @@ -301,6 +315,8 @@ set_alarm_on_cpu_time(const unsigned seconds, sig_handler_type handler) { } } +#endif // PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME + #if PPL_HAVE_DECL_RLIMIT_AS void limit_virtual_memory(const unsigned bytes) { @@ -367,6 +383,8 @@ process_options(int argc, char* argv[]) { exit(0); break; +#ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME + case 'C': l = strtol(optarg, &endptr, 10); if (*endptr || l < 0) @@ -375,6 +393,8 @@ process_options(int argc, char* argv[]) { max_seconds_of_cpu_time = l; break; +#endif + case 'R': l = strtol(optarg, &endptr, 10); if (*endptr || l < 0) @@ -1143,9 +1163,13 @@ main(int argc, char* argv[]) try { // Process command line options. process_options(argc, argv); +#ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME + if (max_seconds_of_cpu_time > 0) set_alarm_on_cpu_time(max_seconds_of_cpu_time, timeout); +#endif + if (max_bytes_of_virtual_memory > 0) limit_virtual_memory(max_bytes_of_virtual_memory); diff --git a/demos/ppl_lcdd/ppl_lcdd_extra_man_text b/demos/ppl_lcdd/ppl_lcdd_extra_man_text index 0e71ed1..c3d6891 100644 --- a/demos/ppl_lcdd/ppl_lcdd_extra_man_text +++ b/demos/ppl_lcdd/ppl_lcdd_extra_man_text @@ -19,6 +19,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. The latest version of the Parma Polyhedra Library and all the documentation is available at \fBhttp://www.cs.unipr.it/ppl/\fR . +[NOTES] +The option \fB\-CSECS\fR (\fB\-\-max\-cpu\fR=\fISECS\fR) is not available +on some platforms. + [SEE ALSO] .BR ppl-config(1) .sp

1 0

pointer "ownership" in the C API?
by Basile Starynkevitch 27 Mar '09

27 Mar '09

Hello All, A newbie question regarding the C API. What is the pointer ownership convention, and where could I find tiny examples or tests of the C API of PPL? So, I made a ppl_Coefficient_t (let's call it k) using ppl_new_Coefficient_from_mpz_t. [BTW, perhaps a ppl_new_Coefficient_from_long_long or a ppl_new_Coefficient_from_int32 might be useful] Then I am filling a ppl_Linear_Expression_t (let's call it l) using ppl_Linear_Expression_add_to_coefficient with the same coeffiient k. Should I explicitly delete by calling ppl_delete_Coefficient(k), or is k now "owned" by l and not available anymore? Could I use twice the same k in different calls to ppl_Linear_Expression_add_to_coefficient? I would suppose that PPL use a refcounting scheme as its memory management (or garbage collection) scheme. Is it correct? Who/when are the refcounters incremented & decremented? Is there a C API to e.g. force incrementation of the refcounter (like GTK has)? BTW, a more general question is about the philosophy of memory management in PPL, especially when interfacing PPL to some language. Since my GCC MELT can be percieved as some language (the MELT lisp dialect) with its runtime (the MELT garbage collector, above the GGC inside GCC), I could view the interfacing of PPL inside MELT as a language binding of PPL. In particular, detailed explanation of Ocaml binding to PPL is welcome, since I happen to know quite well Ocaml (and the C coding rules required by its runtime). Again, apologies for asking such questions (whose answers are probably inside PPL source code). Regards -- Basile STARYNKEVITCH http://starynkevitch.net/Basile/ email: basile<at>starynkevitch<dot>net mobile: +33 6 8501 2359 8, rue de la Faiencerie, 92340 Bourg La Reine, France *** opinions {are only mines, sont seulement les miennes} ***

4 3

[GIT] ppl/ppl(master): Change logs covering the changes made in the CVS repository in 2009.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: aa1972cb6abf92288996218ad38b483ad6d0bd7f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aa1972cb6abf… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 11:28:07 2009 +0100 Change logs covering the changes made in the CVS repository in 2009. They will be replaced by up-to-date change logs obtained from git. --- ChangeLog | 433 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Watchdog/ChangeLog | 2 + 2 files changed, 435 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=aa1972cb…

1 0

[GIT] ppl/ppl(master): Renamed and frozen: the ChangeLog-2001-2008 should never be changed again.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: 503eeb47923053ccc439fa09893ffc6e84f5002e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=503eeb479230… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 11:24:48 2009 +0100 Renamed and frozen: the ChangeLog-2001-2008 should never be changed again. --- ChangeLog => ChangeLog-2001-2008 | 0 Watchdog/{ChangeLog => ChangeLog-2001-2008} | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog-2001-2008 similarity index 100% rename from ChangeLog rename to ChangeLog-2001-2008 diff --git a/Watchdog/ChangeLog b/Watchdog/ChangeLog-2001-2008 similarity index 100% rename from Watchdog/ChangeLog rename to Watchdog/ChangeLog-2001-2008

1 0

[GIT] ppl/ppl(master): Updated to 2008-12-31.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: 586008d48662fdd9105c4ea6609cb03fa1df700b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=586008d48662… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 11:12:06 2009 +0100 Updated to 2008-12-31. --- ChangeLog | 2362 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Watchdog/ChangeLog | 53 ++ 2 files changed, 2415 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=586008d4…

1 0

[GIT] ppl/ppl(master): Fixed make check.
by Abramo Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: d3002c4b2dc9b212d19e84ce25bc0bb8a5f079f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3002c4b2dc9… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Mar 27 08:56:44 2009 +0100 Fixed make check. --- tests/BD_Shape/Makefile.am | 7 +------ tests/BD_Shape/run_tests | 1 + tests/Box/Makefile.am | 7 +------ tests/Box/run_tests | 1 + tests/Octagonal_Shape/Makefile.am | 7 +------ tests/Octagonal_Shape/run_tests | 1 + 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tests/BD_Shape/Makefile.am b/tests/BD_Shape/Makefile.am index b8a8764..97044a5 100644 --- a/tests/BD_Shape/Makefile.am +++ b/tests/BD_Shape/Makefile.am @@ -116,12 +116,7 @@ TEST_CPPFLAGS=-DBD_SHAPE_INSTANCE=mpq_class dist_check_SCRIPTS = run_tests -TESTS = tests - -.PHONY: tests - -tests: run_tests - +$(srcdir)/run_tests +TESTS = $(srcdir)/run_tests XFAIL_TESTS = diff --git a/tests/BD_Shape/run_tests b/tests/BD_Shape/run_tests index c6b3631..b0aa753 100755 --- a/tests/BD_Shape/run_tests +++ b/tests/BD_Shape/run_tests @@ -50,3 +50,4 @@ do $MAKE check TESTS="$check_PROGRAMS" TESTS_ENVIRONMENT="$CHECKER" TEST_CPPFLAGS="-DBD_SHAPE_INSTANCE=$instance" XFAIL_TESTS=$xfail_tests || exit 1 $MAKE clean && rm dirty_marker done +exit 0 diff --git a/tests/Box/Makefile.am b/tests/Box/Makefile.am index e3b032f..53600ef 100644 --- a/tests/Box/Makefile.am +++ b/tests/Box/Makefile.am @@ -120,12 +120,7 @@ TEST_CPPFLAGS=-DBOX_INSTANCE=rt_r_oc dist_check_SCRIPTS = run_tests -TESTS = tests - -.PHONY: tests - -tests: run_tests - +$(srcdir)/run_tests +TESTS = $(srcdir)/run_tests XFAIL_TESTS = diff --git a/tests/Box/run_tests b/tests/Box/run_tests index ad0ac94..05e7404 100755 --- a/tests/Box/run_tests +++ b/tests/Box/run_tests @@ -50,3 +50,4 @@ do $MAKE check TESTS="$check_PROGRAMS" TESTS_ENVIRONMENT="$CHECKER" TEST_CPPFLAGS="-DBOX_INSTANCE=$instance" XFAIL_TESTS=$xfail_tests || exit 1 $MAKE clean && rm dirty_marker done +exit 0 diff --git a/tests/Octagonal_Shape/Makefile.am b/tests/Octagonal_Shape/Makefile.am index 1e0017e..710f81a 100644 --- a/tests/Octagonal_Shape/Makefile.am +++ b/tests/Octagonal_Shape/Makefile.am @@ -123,12 +123,7 @@ TEST_CPPFLAGS=-DOCTAGONAL_SHAPE_INSTANCE=mpq_class dist_check_SCRIPTS = run_tests -TESTS = tests - -.PHONY: tests - -tests: run_tests - +$(srcdir)/run_tests +TESTS = $(srcdir)/run_tests XFAIL_TESTS = diff --git a/tests/Octagonal_Shape/run_tests b/tests/Octagonal_Shape/run_tests index f35e83d..bf55f87 100755 --- a/tests/Octagonal_Shape/run_tests +++ b/tests/Octagonal_Shape/run_tests @@ -50,3 +50,4 @@ do $MAKE check TESTS="$check_PROGRAMS" TESTS_ENVIRONMENT="$CHECKER" TEST_CPPFLAGS="-DOCTAGONAL_SHAPE_INSTANCE=$instance" XFAIL_TESTS=$xfail_tests || exit 1 $MAKE clean && rm dirty_marker done +exit 0

1 0

[GIT] ppl/ppl(master): Missing else branch added.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: f9c0ee2e5e9dd08b8f7bc22a79f3ac3717ec14ea URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f9c0ee2e5e9d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 09:25:46 2009 +0100 Missing else branch added. --- src/Constraint_System.cc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/Constraint_System.cc b/src/Constraint_System.cc index bb477d5..5c2bcc3 100644 --- a/src/Constraint_System.cc +++ b/src/Constraint_System.cc @@ -546,6 +546,8 @@ PPL::Constraint_System::ascii_load(std::istream& s) { x[i].set_is_equality(); else if (str == ">=" || str == ">") x[i].set_is_inequality(); + else + return false; // Checking for equality of actual and declared types. switch (x[i].type()) {

1 0

[GIT] ppl/ppl(master): ascii_load() methods now perform more stringent checks on the input.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: 099b4c25383b66fd3958f0b74c85dbdbc1dfc01b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=099b4c25383b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 08:41:52 2009 +0100 ascii_load() methods now perform more stringent checks on the input. --- src/Bit_Matrix.cc | 2 +- src/Congruence.cc | 2 +- src/Congruence_System.cc | 2 +- src/Constraint_System.cc | 4 ++-- src/Generator_System.cc | 6 ++++-- src/Grid_Generator_System.cc | 2 +- src/Linear_Row.cc | 2 +- src/Linear_System.cc | 2 +- src/Matrix.cc | 2 +- src/Row.cc | 4 ++-- 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/Bit_Matrix.cc b/src/Bit_Matrix.cc index 5a96467..ac126c5 100644 --- a/src/Bit_Matrix.cc +++ b/src/Bit_Matrix.cc @@ -161,7 +161,7 @@ PPL::Bit_Matrix::ascii_load(std::istream& s) { std::string str; if (!(s >> nrows)) return false; - if (!(s >> str)) + if (!(s >> str) || str != "x") return false; if (!(s >> ncols)) return false; diff --git a/src/Congruence.cc b/src/Congruence.cc index cf79d40..3967117 100644 --- a/src/Congruence.cc +++ b/src/Congruence.cc @@ -240,7 +240,7 @@ PPL::Congruence::ascii_load(std::istream& s) { for (dimension_type col = 0; col < new_size - 1; ++col) if (!(s >> x[col])) return false; - if (!(s >> str) || (str.compare("m") != 0)) + if (!(s >> str) || str != "m") return false; if (!(s >> x[new_size-1])) return false; diff --git a/src/Congruence_System.cc b/src/Congruence_System.cc index 7462706..aecb8bc 100644 --- a/src/Congruence_System.cc +++ b/src/Congruence_System.cc @@ -408,7 +408,7 @@ PPL::Congruence_System::ascii_load(std::istream& s) { dimension_type num_columns; if (!(s >> num_rows)) return false; - if (!(s >> str)) + if (!(s >> str) || str != "x") return false; if (!(s >> num_columns)) return false; diff --git a/src/Constraint_System.cc b/src/Constraint_System.cc index 21240aa..bb477d5 100644 --- a/src/Constraint_System.cc +++ b/src/Constraint_System.cc @@ -518,7 +518,7 @@ PPL::Constraint_System::ascii_load(std::istream& s) { dimension_type ncols; if (!(s >> nrows)) return false; - if (!(s >> str)) + if (!(s >> str) || str != "x") return false; if (!(s >> ncols)) return false; @@ -544,7 +544,7 @@ PPL::Constraint_System::ascii_load(std::istream& s) { return false; if (str == "=") x[i].set_is_equality(); - else + else if (str == ">=" || str == ">") x[i].set_is_inequality(); // Checking for equality of actual and declared types. diff --git a/src/Generator_System.cc b/src/Generator_System.cc index b95835b..4793f5d 100644 --- a/src/Generator_System.cc +++ b/src/Generator_System.cc @@ -886,7 +886,7 @@ PPL::Generator_System::ascii_load(std::istream& s) { dimension_type ncols; if (!(s >> nrows)) return false; - if (!(s >> str)) + if (!(s >> str) || str != "x") return false; if (!(s >> ncols)) return false; @@ -912,8 +912,10 @@ PPL::Generator_System::ascii_load(std::istream& s) { return false; if (str == "L") x[i].set_is_line(); - else + else if (str == "R" || str == "P" || str == "C") x[i].set_is_ray_or_point(); + else + return false; // Checking for equality of actual and declared types. switch (x[i].type()) { diff --git a/src/Grid_Generator_System.cc b/src/Grid_Generator_System.cc index 3056eb5..165cbf3 100644 --- a/src/Grid_Generator_System.cc +++ b/src/Grid_Generator_System.cc @@ -218,7 +218,7 @@ PPL::Grid_Generator_System::ascii_load(std::istream& s) { if (!(s >> num_rows)) return false; std::string str; - if (!(s >> str)) + if (!(s >> str) || str != "x") return false; if (!(s >> num_columns)) return false; diff --git a/src/Linear_Row.cc b/src/Linear_Row.cc index 7829f79..f536abe 100644 --- a/src/Linear_Row.cc +++ b/src/Linear_Row.cc @@ -211,7 +211,7 @@ PPL::Linear_Row::ascii_load(std::istream& s) { for (dimension_type col = 0; col < new_size; ++col) if (!(s >> x[col])) return false; - if (!(s >> str) || (str.compare("f") != 0)) + if (!(s >> str) || str != "f") return false; return flags().ascii_load(s); } diff --git a/src/Linear_System.cc b/src/Linear_System.cc index a402bcd..f5e651d 100644 --- a/src/Linear_System.cc +++ b/src/Linear_System.cc @@ -152,7 +152,7 @@ PPL::Linear_System::ascii_load(std::istream& s) { dimension_type ncols; if (!(s >> nrows)) return false; - if (!(s >> str)) + if (!(s >> str) || str != "x") return false; if (!(s >> ncols)) return false; diff --git a/src/Matrix.cc b/src/Matrix.cc index fc81df1..19eae9d 100644 --- a/src/Matrix.cc +++ b/src/Matrix.cc @@ -303,7 +303,7 @@ PPL::Matrix::ascii_load(std::istream& s) { dimension_type x_num_cols; if (!(s >> x_num_rows)) return false; - if (!(s >> str) || (str.compare("x") != 0)) + if (!(s >> str) || str != "x") return false; if (!(s >> x_num_cols)) return false; diff --git a/src/Row.cc b/src/Row.cc index 39d292f..addd828 100644 --- a/src/Row.cc +++ b/src/Row.cc @@ -149,7 +149,7 @@ bool PPL::Row::Flags::ascii_load(std::istream& s) { std::string str; std::streamsize sz = s.width(2); - if (!(s >> str) || (str.compare("0x") != 0)) + if (!(s >> str) || str != "0x") return false; s.width(sz); std::istream::fmtflags f = s.setf(std::istream::hex); @@ -193,7 +193,7 @@ PPL::Row::ascii_load(std::istream& s) { for (dimension_type col = 0; col < new_size; ++col) if (!(s >> x[col])) return false; - if (!(s >> str) || (str.compare("f") != 0)) + if (!(s >> str) || str != "f") return false; return flags().ascii_load(s); }

1 0

[GIT] ppl/ppl(master): Spurious spaces removed.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: c010978f5fdf88d1655fc4ae03b3e114fb3ad8d5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c010978f5fdf… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 08:40:58 2009 +0100 Spurious spaces removed. --- tests/Polyhedron/ascii_dump_load1.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Polyhedron/ascii_dump_load1.cc b/tests/Polyhedron/ascii_dump_load1.cc index f0987ed..c98955d 100644 --- a/tests/Polyhedron/ascii_dump_load1.cc +++ b/tests/Polyhedron/ascii_dump_load1.cc @@ -262,7 +262,7 @@ test08() { string str; do f >> str; - while (str != "(not_up-to-date)" ); + while (str != "(not_up-to-date)"); f.seekp(0, ios_base::cur); f << "A\n"; close(f); @@ -390,7 +390,7 @@ test12() { string str; do f >> str; - while (str != "(not_up-to-date)" ); + while (str != "(not_up-to-date)"); f.seekp(0, ios_base::cur); f << "\nA"; close(f);

1 0