- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Corrected errors in method Grid::relation_with( const Constraint&) const.
by Enea Zaffanella 03 Dec '11

03 Dec '11

Module: ppl/ppl Branch: master Commit: b67af6c1ba5a560e2ab48a37cccf8fc18782a257 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b67af6c1ba5a… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Dec 3 09:17:12 2011 +0100 Corrected errors in method Grid::relation_with(const Constraint&) const. The method was affected by two problems: 1) when working on a non-minimized grid generator system, the points after the first one were transformed into parameters that were not satisfying the Grid_Generator invariant (reported by Marco Poletti); 2) the method was providing an incorrect result when comparing a grid generator line/parameter with a (strict) inequality constraint, as happens for test20() in tests/Grid/relations3.cc. --- src/Grid_public.cc | 75 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 46 insertions(+), 29 deletions(-) diff --git a/src/Grid_public.cc b/src/Grid_public.cc index e05731c..85b3566 100644 --- a/src/Grid_public.cc +++ b/src/Grid_public.cc @@ -623,53 +623,70 @@ PPL::Grid::relation_with(const Constraint& c) const { bool point_is_included = false; bool point_saturates = false; - const Grid_Generator* first_point = NULL; - - for (Grid_Generator_System::const_iterator g = gen_sys.begin(), - gen_sys_end = gen_sys.end(); g != gen_sys_end; ++g) - switch (g->type()) { + const Grid_Generator* first_point = 0; + for (Grid_Generator_System::const_iterator i = gen_sys.begin(), + i_end = gen_sys.end(); i != i_end; ++i) { + const Grid_Generator& g = *i; + switch (g.type()) { case Grid_Generator::POINT: { - Grid_Generator& gen = const_cast<Grid_Generator&>(*g); - if (first_point == NULL) { - first_point = &gen; - const int sign = Scalar_Products::sign(c, gen); - Constraint::Type type = c.type(); - if ((type == Constraint::NONSTRICT_INEQUALITY && sign == 0)) { - point_saturates = true; - } + if (first_point == 0) { + first_point = &g; + const int sign = Scalar_Products::sign(c, g); + if (sign == 0) + point_saturates = !c.is_strict_inequality(); else if (sign > 0) - point_is_included = true; + point_is_included = !c.is_equality(); break; } - // Else convert g to a parameter, and continue into the - // parameter case. + // Not the first point: convert `g' to be a parameter ... + Grid_Generator& gen = const_cast<Grid_Generator&>(g); + const Grid_Generator& point = *first_point; + const Coefficient& p_div = g[0]; + if (p_div != Coefficient_one()) { + for (dimension_type j = gen.size() - 1; j-- > 1; ) + gen[j] *= p_div; + } + const Coefficient& g_div = gen[0]; + if (g_div == Coefficient_one()) { + for (dimension_type j = gen.size() - 1; j-- > 1; ) + gen[j] -= point[j]; + } + else { + for (dimension_type j = gen.size() - 1; j-- > 1; ) + sub_mul_assign(gen[j], g_div, point[j]); + } + gen[0] *= p_div; + gen.strong_normalize(); gen.set_is_parameter(); - const Grid_Generator& first = *first_point; - for (dimension_type i = gen.size() - 1; i-- > 0; ) - gen[i] -= first[i]; + PPL_ASSERT(gen.OK()); + // ... and fall through into the parameter case. } case Grid_Generator::PARAMETER: case Grid_Generator::LINE: - Grid_Generator& gen = const_cast<Grid_Generator&>(*g); - if (gen.is_line_or_parameter()) - for (dimension_type i = c.space_dimension(); i-- > 0; ) { - Variable v(i); - if (c.coefficient(v) != 0 && gen.coefficient(v) != 0) - return Poly_Con_Relation::strictly_intersects(); - } + { + const int sign = c.is_strict_inequality() + ? Scalar_Products::reduced_sign(c, g) + : Scalar_Products::sign(c, g); + if (sign != 0) + return Poly_Con_Relation::strictly_intersects(); + } break; - } + } // switch + } + // If this program point is reached, then all lines and parameters + // saturate the constraint. Hence, the result is determined by + // the previosly computed relation with the point. if (point_saturates) - // Any parameters and lines are also included. return Poly_Con_Relation::saturates() && Poly_Con_Relation::is_included(); + if (point_is_included) - // Any parameters and lines are also included. return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::is_disjoint(); }

1 0

[GIT] ppl/ppl(master): Added new test showing an error in Grid:: relation_with(const Constraint&).
by Enea Zaffanella 03 Dec '11

03 Dec '11

Module: ppl/ppl Branch: master Commit: 856eabd63f477b4ada10bd2c75f58a3e594c355b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=856eabd63f47… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Dec 3 09:13:58 2011 +0100 Added new test showing an error in Grid::relation_with(const Constraint&). --- tests/Grid/relations3.cc | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/tests/Grid/relations3.cc b/tests/Grid/relations3.cc index 05e8e60..bd0bd11 100644 --- a/tests/Grid/relations3.cc +++ b/tests/Grid/relations3.cc @@ -438,6 +438,29 @@ test19() { return ok; } +// A variant of test06. +bool +test20() { + Variable A(0); + Variable B(1); + + Grid gr(2, EMPTY); + gr.add_grid_generator(grid_point()); + gr.add_grid_generator(grid_point(2*A + 5*B)); + // Force minimization. + (void) gr.minimized_grid_generators(); + print_generators(gr, "*** gr ***"); + + bool ok = (gr.relation_with(5*A - 2*B == 1) + == Poly_Con_Relation::is_disjoint() + && gr.relation_with(5*A - 2*B > 1) + == Poly_Con_Relation::is_disjoint() + && gr.relation_with(5*A - 2*B >= 1) + == Poly_Con_Relation::is_disjoint()); + + return ok; +} + } // namespace BEGIN_MAIN @@ -460,4 +483,5 @@ BEGIN_MAIN DO_TEST(test17); DO_TEST(test18); DO_TEST(test19); + DO_TEST(test20); END_MAIN

1 0

[GIT] ppl/ppl(master): Project vocabulary fixes.
by Roberto Bagnara 13 Nov '11

13 Nov '11

Module: ppl/ppl Branch: master Commit: 0ae35bbbc1e8f4d1a38ced7fe7190be9a29e4fb6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0ae35bbbc1e8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Nov 13 20:00:27 2011 +0100 Project vocabulary fixes. Detected by ECLAIR service progvcbl. --- devtools/good_words | 2 +- src/Pointset_Powerset.templates.hh | 30 ++++++++++--------- src/Polyhedron_nonpublic.cc | 12 ++++---- src/Weight_Profiler.cc | 31 ++++++++++--------- src/Weight_Profiler.defs.hh | 57 +++++++++++++++++++++++++++++------- 5 files changed, 85 insertions(+), 47 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=0ae35bbb…

1 0

[GIT] ppl/ppl(master): Updated.
by Roberto Bagnara 13 Nov '11

13 Nov '11

Module: ppl/ppl Branch: master Commit: 6d8262280e99982010e8914740b5df3b195c4bc5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6d8262280e99… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Nov 13 19:59:37 2011 +0100 Updated. --- devtools/vocabulary | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/devtools/vocabulary b/devtools/vocabulary index d8a9539..fe50219 100644 --- a/devtools/vocabulary +++ b/devtools/vocabulary @@ -1,4 +1,4 @@ -TOTAL_COUNT 593634 +TOTAL_COUNT 593644 a 5311 ab 1 abandon 18 @@ -60,12 +60,12 @@ additive 28 address 1 addressed 1 adds 125 -adj 4 adjacency 3 adjacent 10 adjust 56 adjusted 37 adjusting 7 +adjustment 6 adjusts 3 admitted 8 adopt 1 @@ -3148,6 +3148,7 @@ sqrt 79 square 39 squared 7 squareness 2 +squares 5 sr 4 src 57 srl 361 @@ -3588,6 +3589,7 @@ vanish 5 var 1994 variable 1506 variables 702 +variance 3 variant 6 variants 2 variation 1

1 0

[GIT] ppl/ppl(master): Sorted list of good identifiers.
by Roberto Bagnara 13 Nov '11

13 Nov '11

Module: ppl/ppl Branch: master Commit: ef3f4d0a5ccaf2b176d7d9978c7f103ef5bdf103 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ef3f4d0a5cca… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Nov 13 19:58:29 2011 +0100 Sorted list of good identifiers. --- devtools/good_ids | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 258 insertions(+), 0 deletions(-) diff --git a/devtools/good_ids b/devtools/good_ids new file mode 100644 index 0000000..5fdc170 --- /dev/null +++ b/devtools/good_ids @@ -0,0 +1,258 @@ +Det_PSET +EOF +FOK +FP_FAST_FMA +FP_FAST_FMAF +FP_FAST_FMAL +ITIMER_PROF +ITIMER_REAL +LLONG_MAX +LLONG_MIN +NDEBUG +PPL_FPMATH_MAY_USE_SSE +PPL_PACKAGE_BUGREPORT +RLIMIT_AS +RLIMIT_CPU +RUSAGE_SELF +Rule B.PROGVCBL: +SA_ONESHOT +SA_RESETHAND +SCHAR_MAX +SCHAR_MIN +SHRT_BITS +SHRT_MAX +SHRT_MIN +SIGALRM +SIGILL +SIGPROF +SIGXCPU +TVB_DONT_KNOW +TVB_FALSE +TVB_TRUE +TW_Pending_List +UCHAR_MAX +UINT_MAX +ULLONG_MAX +ULONG_LONG_MAX +ULONG_MAX +USHRT_MAX +VR_LGE +V_CVT_STR_UNK +V_LGE +WD_Pending_List +__CYGWIN__ +__builtin_clz +__builtin_clzl +__builtin_clzll +__builtin_ctz +__builtin_ctzl +__builtin_ctzll +__gnu_hurd__ +addmod +aps +argc +argv +auto_ptr +cassert +cbegin +ccgs +ccs +cend +cerr +cerrno +cgr +cii +cin +climits +cmath +cout +csetjmp +csignal +csr +css_normalized +cstdarg +cstddef +cstdio +cstdlib +cstring +ctime +deque +dim_prec +elif +endif +endl +endptr +eof +errno +extern +fcp +feclearexcept +fegetround +fenv +fesetround +fetestexcept +fflush +ffs +fits_slong_p +fits_ulong_p +fma +fmaf +fmal +fmod +fmtflags +fprintf +fread +fstream +fwrite +get_den +get_ui +getc +getopt +getopt_long +getrlimit +getrusage +gsr +ieeefp +ifdef +ifndef +ifstream +iomanip +ios +ios_base +iosfwd +iostream +is_iec559 +iss +isspace +istream +istringstream +itimerval +jmp_buf +ldexp +lend +longjmp +mem_fun_ref +memcpy +mp_ptr +mp_srcptr +mpn_popcount +mpz_addmul +mpz_cdiv_q +mpz_cdiv_q_2exp +mpz_cdiv_r_2exp +mpz_clrbit +mpz_divexact +mpz_fdiv_q +mpz_fdiv_q_2exp +mpz_fdiv_r +mpz_fdiv_r_2exp +mpz_get_ui +mpz_getlimbn +mpz_ptr +mpz_realloc2 +mpz_set_ui +mpz_setbit +mpz_sizeinbase +mpz_sqrtrem +mpz_srcptr +mpz_submul +mpz_tdiv_q +mpz_tdiv_q_2exp +mpz_tdiv_qr +mpz_tdiv_r +mpz_tdiv_r_2exp +mpz_tstbit +mpz_ui_pow_ui +mulmod +nbrows +ncols +not_eof +npi +nptr +ofstream +optarg +optind +ostream +ostringstream +pbackfail +pkint_set +pkint_set_si +pkint_sgn +pkint_t +ppi +ppl_setround_function +ppl_setround_function_p +printf +prp +ptr +ptrdiff_t +putc +rbegin +rdir +rdstate +rint +rintf +rintl +rl +rlim_cur +rlimit +rusage +setf +setfill +setjmp +setrlimit +setstate +setw +sigemptyset +signum +sigset_t +sstream +stderr +stdexcept +stdout +strcmp +streamsize +strerror +stringstream +strlen +strtol +strtoll +strtoull +submod +substr +tcp +timespec +timeval +typedef +typename +typeof +uflow +uint16_t +uint32_t +uint64_t +uint_fast16_t +uint_fast32_t +uint_fast64_t +ull +undef +ungetc +unistd +vclass +vfprintf +xl +xls +xp +xsgetn +xsputn +xsz +xus +xv +xx +yl +yls +yp +ysz +yus +yv +zi +zp

1 0

[GIT] ppl/ppl(master): Vocabulary updated.
by Roberto Bagnara 13 Nov '11

13 Nov '11

Module: ppl/ppl Branch: master Commit: e37503ce5059b3082bd5a3fc47e4971f2ab5340b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e37503ce5059… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Nov 13 10:17:43 2011 +0100 Vocabulary updated. --- devtools/good_words | 75 +-------------------------------------------------- devtools/vocabulary | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/devtools/good_words b/devtools/good_words index f40ae19..7898192 100644 --- a/devtools/good_words +++ b/devtools/good_words @@ -1,74 +1 @@ -abi -alloc -asm -bgp -buf -ci -cj -cjj -conflicting -cp -csp -ctbf -dmax -ee -enum -ep -eps -eq -eqs -gc -gg -ggs -gsp -idiv -impl -ineq -ineqs -inhomo -inquire -itc -ite -ja -jb -jj -laid -lexico -lj -lk -minf -modeled -modi -msb -nle -nmax -nonsaturating -nrows -overwrite -pcount -pfunc -pj -pred -qh -qual -rebalancing -remergeable -repr -rpi -satrow -satur -sij -streambuf -struct -succ -tbf -unget -uninit -unsat -uop -upd -utime -xi -xstr -yi -yy +a diff --git a/devtools/vocabulary b/devtools/vocabulary index 79b9100..d8a9539 100644 --- a/devtools/vocabulary +++ b/devtools/vocabulary @@ -1,8 +1,9 @@ -TOTAL_COUNT 589666 +TOTAL_COUNT 593634 a 5311 ab 1 abandon 18 abandoning 9 +abi 9 ability 4 able 22 abort 1 @@ -93,6 +94,7 @@ alias 17 aliasing 1 aligned 4 all 1053 +alloc 10 allocate 16 allocated 29 allocates 3 @@ -192,6 +194,7 @@ ascii 429 aside 2 ask 6 asks 4 +asm 2 assert 2146 asserted 2 assertion 34 @@ -294,6 +297,7 @@ between 258 beware 1 beyond 3 bft 9 +bgp 35 bhmz 24 bhrz 81 bhz 54 @@ -349,6 +353,7 @@ brief 1098 broken 20 brother 2 bsd 3 +buf 31 buffer 15 bug 9 bugseng 722 @@ -453,8 +458,11 @@ choosing 1 chop 2 chosen 10 chunk 4 +ci 241 ci 242 circles 1 +cj 135 +cjj 2 ck 68 cl 4 clang 1 @@ -596,6 +604,7 @@ cone 8 config 72 configuration 3 configure 1 +conflicting 1 confuse 2 congruence 1182 congruences 595 @@ -711,6 +720,7 @@ couple 1 course 9 covers 15 cow 5 +cp 55 cpu 2 cr 2 create 24 @@ -722,7 +732,9 @@ criteria 23 critical 9 cs 2544 csecs 29 +csp 20 cst 12 +ctbf 6 ctor 18 ctx 57 cu 21 @@ -936,6 +948,7 @@ division 11 divisor 359 divisors 42 dj 29 +dmax 7 do 274 document 1 documentation 9 @@ -990,6 +1003,7 @@ ed 1 edg 4 edge 32 edition 3 +ee 4 effect 18 efficiency 12 efficient 19 @@ -1062,12 +1076,16 @@ entities 4 entity 2 entries 18 entry 19 +enum 81 enumerated 2 enumeration 3 env 15 envelope 1 +ep 3 +eps 128 epsilon 146 eq 486 +eqs 15 equal 595 equalities 238 equality 424 @@ -1338,6 +1356,7 @@ gather 5 gathered 2 gauss 10 gaussian 4 +gc 2 gcc 9 gcd 324 gcdext 53 @@ -1363,6 +1382,8 @@ getitimer 5 getline 9 gets 12 getting 7 +gg 32 +ggs 54 give 2 given 101 gives 84 @@ -1395,6 +1416,7 @@ growing 2 grown 3 growth 2 gs 803 +gsp 12 gt 159 guarantee 14 guaranteed 4 @@ -1490,6 +1512,7 @@ identifies 1 identify 10 identifying 5 identity 26 +idiv 41 ie 11 ieee 125 if 11371 @@ -1503,6 +1526,7 @@ illegal 13 image 272 images 5 immediately 24 +impl 321 implement 10 implementation 807 implementations 8 @@ -1578,6 +1602,8 @@ induced 6 induction 2 inefficiencies 1 inefficient 9 +ineq 48 +ineqs 13 inequalities 144 inequality 376 inexact 97 @@ -1597,6 +1623,7 @@ inherited 22 inheriting 2 inherits 70 inhibit 1 +inhomo 28 inhomogeneous 356 init 80 initial 43 @@ -1613,6 +1640,7 @@ inlined 1 inlines 266 inner 7 input 286 +inquire 1 insensitive 1 insert 629 inserted 51 @@ -1713,6 +1741,8 @@ isqrt 2 issue 5 issues 6 it 2709 +itc 1 +ite 18 item 46 items 1 iter 463 @@ -1730,7 +1760,10 @@ itv 534 iv 13 ix 5 j 2621 +ja 16 +jb 17 ji 8 +jj 37 job 4 join 19 joined 5 @@ -1759,6 +1792,7 @@ knuth 2 l 293 lack 1 lacks 2 +laid 2 lambda 52 land 1 language 3 @@ -1807,6 +1841,7 @@ let 68 letters 14 letting 3 level 97 +lexico 11 lexicographic 12 lexicographically 3 lf 299 @@ -1856,6 +1891,8 @@ listed 3 lists 1 literal 1 little 2 +lj 4 +lk 4 ln 10 lo 20 load 160 @@ -1992,6 +2029,7 @@ middle 3 might 19 mimicking 1 min 467 +minf 132 mingw 1 mini 10 minimal 60 @@ -2021,7 +2059,9 @@ mlb 31 mod 135 mode 140 model 9 +modeled 1 modes 1 +modi 4 modifiable 2 modification 10 modifications 79 @@ -2053,6 +2093,7 @@ mpq 454 mpz 734 mr 2 ms 119 +msb 5 msg 1 msp 101 mu 180 @@ -2128,6 +2169,8 @@ nf 10 nicer 3 nifty 1 nl 14 +nle 21 +nmax 3 nnc 304 no 814 node 527 @@ -2143,6 +2186,7 @@ nonetheless 2 nonnegative 22 nonnegativity 2 nonpositive 1 +nonsaturating 24 nonstrict 35 nontrivial 10 nonzero 40 @@ -2164,6 +2208,7 @@ notice 80 notion 5 now 117 nr 10 +nrows 58 ns 69 nu 6 null 102 @@ -2295,6 +2340,7 @@ overload 1 overloaded 2 overloading 2 overloads 1 +overwrite 1 overwritten 4 own 7 owned 9 @@ -2342,6 +2388,7 @@ past 43 path 362 pay 1 pc 10 +pcount 21 pd 20 pending 1089 per 35 @@ -2360,6 +2407,7 @@ permuted 1 permutes 4 perspective 3 pf 10 +pfunc 76 pg 5 ph 480 phase 21 @@ -2373,6 +2421,7 @@ pity 1 pivot 381 pivoting 10 pivots 1 +pj 128 pl 10 place 59 placed 3 @@ -2450,6 +2499,7 @@ precisely 17 precision 114 precondition 1 preconditions 4 +pred 13 predecessor 29 predecessors 7 predecrement 1 @@ -2563,11 +2613,13 @@ putting 1 pwl 218 px 12 q 430 +qh 27 qr 2 quad 46 quadrant 60 quadrants 3 quadratic 3 +qual 84 qualification 7 qualifiers 1 quantify 16 @@ -2637,6 +2689,7 @@ reasons 1 rebalance 4 rebalanced 4 rebalances 1 +rebalancing 1 rebuild 8 recall 6 recalling 1 @@ -2727,6 +2780,7 @@ remap 1 remaps 7 remarks 10 remember 5 +remergeable 12 removal 28 remove 286 removed 71 @@ -2753,6 +2807,7 @@ replicas 7 replicated 7 report 2 reported 1 +repr 24 represent 61 representable 15 representation 160 @@ -2838,6 +2893,7 @@ rounding 731 routine 1 row 4290 rows 2514 +rpi 19 rs 35 rsv 10 ru 64 @@ -2868,6 +2924,8 @@ satisfied 127 satisfies 48 satisfy 33 satisfying 15 +satrow 6 +satur 2 saturate 59 saturated 29 saturates 125 @@ -2983,6 +3041,7 @@ signedness 4 significance 1 significant 3 signs 9 +sij 25 silence 1 silent 11 silently 1 @@ -3139,6 +3198,7 @@ str 513 straight 1 strategy 59 stream 9 +streambuf 41 streams 2 street 282 strict 362 @@ -3149,6 +3209,7 @@ strip 3 strong 238 stronger 2 strongly 159 +struct 306 structure 44 structures 30 studying 2 @@ -3180,6 +3241,7 @@ subtracting 12 subtraction 2 subtracts 1 subtree 120 +succ 2 succeeded 2 succeeding 8 succeeds 20 @@ -3255,6 +3317,7 @@ target 66 tautological 36 tautologies 10 tautology 20 +tbf 30 technical 2 technique 49 techniques 2 @@ -3441,8 +3504,10 @@ understanding 1 unexpected 2 unfeasible 59 unfolding 1 +unget 7 uniform 1 unimplemented 7 +uninit 2 uninitialized 31 union 54 unique 13 @@ -3466,6 +3531,7 @@ unreferenced 1 unregisters 1 unrepresentable 19 unrestricted 16 +unsat 3 unsatisfiability 3 unsatisfiable 54 unset 47 @@ -3478,7 +3544,9 @@ until 13 untouched 43 unused 125 unusual 2 +uop 2 up 1632 +upd 24 update 263 updated 38 updates 10 @@ -3507,6 +3575,7 @@ usual 14 usually 1 utilities 10 utility 6 +utime 10 v 2644 va 3 val 211 @@ -3647,13 +3716,17 @@ wrongly 1 wv 3 www 295 x 7318 +xi 111 +xstr 8 y 6158 yes 44 yet 29 +yi 69 yield 1 yields 4 you 596 your 288 +yy 97 z 566 zero 1529 zeroes 60

1 0

[GIT] ppl/ppl(master): Project vocabulary fixes.
by Roberto Bagnara 13 Nov '11

13 Nov '11

Module: ppl/ppl Branch: master Commit: 5f72e09e1d7727f01e735bd6c5f943ed70df654a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5f72e09e1d77… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Nov 13 09:54:01 2011 +0100 Project vocabulary fixes. Detected by ECLAIR service progvcbl. --- devtools/good_items | 38 +++++++++++++++++++++++++++-- devtools/good_words | 13 ++++++++++ devtools/vocabulary | 1 - src/Pointset_Powerset.templates.hh | 28 +++++++++++----------- src/Powerset.templates.hh | 12 ++++---- src/algorithms.hh | 8 +++--- src/c_streambuf.cc | 24 +++++++++--------- src/c_streambuf.defs.hh | 4 +- src/c_streambuf.inlines.hh | 2 +- src/checked.inlines.hh | 46 ++++++++++++++++++----------------- src/checked_float.inlines.hh | 29 +++++++++++----------- src/checked_int.inlines.hh | 4 +- src/checked_mpq.inlines.hh | 6 ++-- src/globals.defs.hh | 2 +- src/math_utilities.defs.hh | 10 ++++---- src/math_utilities.inlines.hh | 24 +++++++++--------- src/meta_programming.hh | 2 +- src/simplify.cc | 4 +- src/stdiobuf.cc | 12 ++++---- src/stdiobuf.defs.hh | 2 +- src/stdiobuf.inlines.hh | 2 +- src/termination.cc | 16 ++++++------ src/termination.templates.hh | 4 +- src/wrap_assign.hh | 40 ++++++++++++++++--------------- src/wrap_string.cc | 10 ++++---- utils/timings.cc | 14 +++++----- 26 files changed, 203 insertions(+), 154 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=5f72e09e…

1 0

[GIT] ppl/ppl(master): Project vocabulary fixes.
by Roberto Bagnara 12 Nov '11

12 Nov '11

Module: ppl/ppl Branch: master Commit: 79fc8389a9868bee013ddec5a0c7034722954de8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=79fc8389a986… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Nov 12 12:57:47 2011 +0100 Project vocabulary fixes. Detected by ECLAIR service progvcbl. --- devtools/good_items | 5 +- devtools/good_words | 5 ++- devtools/vocabulary | 1 - src/PIP_Problem.defs.hh | 2 +- src/Polyhedron_public.cc | 116 ++++++++++++++++++++++++---------------------- src/Sparse_Row.cc | 2 +- src/Temp.defs.hh | 2 +- 7 files changed, 70 insertions(+), 63 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=79fc8389…

1 0

[GIT] ppl/ppl(master): Project vocabulary fixes.
by Roberto Bagnara 10 Nov '11

10 Nov '11

Module: ppl/ppl Branch: master Commit: d77432ac84ababb6b5c942c8fcfd9038845852da URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d77432ac84ab… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 10 11:07:42 2011 +0100 Project vocabulary fixes. Detected by ECLAIR service progvcbl. --- devtools/good_items | 1 + devtools/vocabulary | 1 - src/BD_Shape.defs.hh | 12 ++++---- src/BD_Shape.inlines.hh | 4 +- src/Box.defs.hh | 8 +++--- src/Box.templates.hh | 24 ++++++++-------- src/Grid.defs.hh | 6 ++-- src/Grid_public.cc | 12 ++++---- src/Octagonal_Shape.defs.hh | 12 ++++---- src/Octagonal_Shape.inlines.hh | 4 +- src/PIP_Problem.defs.hh | 16 ++++++------ src/Pointset_Powerset.cc | 6 ++-- src/Pointset_Powerset.defs.hh | 12 ++++---- src/Pointset_Powerset.templates.hh | 31 ++++++++++++---------- src/Polyhedron.defs.hh | 12 ++++---- src/Polyhedron_nonpublic.cc | 12 ++++---- src/Polyhedron_public.cc | 11 ++++--- src/wrap_assign.hh | 50 ++++++++++++++++++------------------ 18 files changed, 119 insertions(+), 115 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=d77432ac…

1 0

[GIT] ppl/ppl(master): Project vocabulary fixes.
by Roberto Bagnara 10 Nov '11

10 Nov '11

Module: ppl/ppl Branch: master Commit: afb4a0a0ca99f3f50fb1e52136c1509ff76e148d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=afb4a0a0ca99… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 10 10:12:19 2011 +0100 Project vocabulary fixes. Detected by ECLAIR service progvcbl. --- src/Pointset_Powerset.templates.hh | 178 ++++++++++++++++++------------------ 1 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/Pointset_Powerset.templates.hh b/src/Pointset_Powerset.templates.hh index b3649f1..f522a6b 100644 --- a/src/Pointset_Powerset.templates.hh +++ b/src/Pointset_Powerset.templates.hh @@ -920,45 +920,45 @@ Pointset_Powerset<PSET>::maximize(const Linear_Expression& expr, bool first = true; - PPL_DIRTY_TEMP_COEFFICIENT(supt_n); - PPL_DIRTY_TEMP_COEFFICIENT(supt_d); - supt_n = 0; - supt_d = 1; - bool maxt = 0; - - PPL_DIRTY_TEMP_COEFFICIENT(supi_n); - PPL_DIRTY_TEMP_COEFFICIENT(supi_d); - supi_n = 0; - supi_d = 1; - bool maxi = 0; + PPL_DIRTY_TEMP_COEFFICIENT(best_sup_n); + PPL_DIRTY_TEMP_COEFFICIENT(best_sup_d); + best_sup_n = 0; + best_sup_d = 1; + bool best_max = 0; + + PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_n); + PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_d); + iter_sup_n = 0; + iter_sup_d = 1; + bool iter_max = 0; PPL_DIRTY_TEMP_COEFFICIENT(tmp); for (Sequence_const_iterator si = x.sequence.begin(), s_end = x.sequence.end(); si != s_end; ++si) { - if (!si->pointset().maximize(expr, supi_n, supi_d, maxi)) + if (!si->pointset().maximize(expr, iter_sup_n, iter_sup_d, iter_max)) return false; else if (first) { first = false; - supt_n = supi_n; - supt_d = supi_d; - maxt = maxi; + best_sup_n = iter_sup_n; + best_sup_d = iter_sup_d; + best_max = iter_max; } else { - tmp = (supt_n * supi_d) - (supi_n * supt_d); + tmp = (best_sup_n * iter_sup_d) - (iter_sup_n * best_sup_d); if (tmp < 0) { - supt_n = supi_n; - supt_d = supi_d; - maxt = maxi; + best_sup_n = iter_sup_n; + best_sup_d = iter_sup_d; + best_max = iter_max; } else if (tmp == 0) - maxt = maxt || maxi; + best_max = best_max || iter_max; } } - sup_n = supt_n; - sup_d = supt_d; - maximum = maxt; + sup_n = best_sup_n; + sup_d = best_sup_d; + maximum = best_max; return true; } @@ -976,51 +976,51 @@ Pointset_Powerset<PSET>::maximize(const Linear_Expression& expr, bool first = true; - PPL_DIRTY_TEMP_COEFFICIENT(supt_n); - PPL_DIRTY_TEMP_COEFFICIENT(supt_d); - supt_n = 0; - supt_d = 1; - bool maxt = 0; + PPL_DIRTY_TEMP_COEFFICIENT(best_sup_n); + PPL_DIRTY_TEMP_COEFFICIENT(best_sup_d); + best_sup_n = 0; + best_sup_d = 1; + bool best_max = 0; Generator gt = point(); - PPL_DIRTY_TEMP_COEFFICIENT(supi_n); - PPL_DIRTY_TEMP_COEFFICIENT(supi_d); - supi_n = 0; - supi_d = 1; - bool maxi = 0; + PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_n); + PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_d); + iter_sup_n = 0; + iter_sup_d = 1; + bool iter_max = 0; Generator gi = point(); PPL_DIRTY_TEMP_COEFFICIENT(tmp); for (Sequence_const_iterator si = x.sequence.begin(), s_end = x.sequence.end(); si != s_end; ++si) { - if (!si->pointset().maximize(expr, supi_n, supi_d, maxi, gi)) + if (!si->pointset().maximize(expr, iter_sup_n, iter_sup_d, iter_max, gi)) return false; else if (first) { first = false; - supt_n = supi_n; - supt_d = supi_d; - maxt = maxi; + best_sup_n = iter_sup_n; + best_sup_d = iter_sup_d; + best_max = iter_max; gt = gi; } else { - tmp = (supt_n * supi_d) - (supi_n * supt_d); + tmp = (best_sup_n * iter_sup_d) - (iter_sup_n * best_sup_d); if (tmp < 0) { - supt_n = supi_n; - supt_d = supi_d; - maxt = maxi; + best_sup_n = iter_sup_n; + best_sup_d = iter_sup_d; + best_max = iter_max; gt = gi; } else if (tmp == 0) { - maxt = maxt || maxi; + best_max = best_max || iter_max; gt = gi; } } } - sup_n = supt_n; - sup_d = supt_d; - maximum = maxt; + sup_n = best_sup_n; + sup_d = best_sup_d; + maximum = best_max; g = gt; return true; } @@ -1038,45 +1038,45 @@ Pointset_Powerset<PSET>::minimize(const Linear_Expression& expr, bool first = true; - PPL_DIRTY_TEMP_COEFFICIENT(inft_n); - PPL_DIRTY_TEMP_COEFFICIENT(inft_d); - inft_n = 0; - inft_d = 1; - bool mint = 0; + PPL_DIRTY_TEMP_COEFFICIENT(best_inf_n); + PPL_DIRTY_TEMP_COEFFICIENT(best_inf_d); + best_inf_n = 0; + best_inf_d = 1; + bool best_min = 0; - PPL_DIRTY_TEMP_COEFFICIENT(infi_n); - PPL_DIRTY_TEMP_COEFFICIENT(infi_d); - infi_n = 0; - infi_d = 1; - bool mini = 0; + PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_n); + PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_d); + iter_inf_n = 0; + iter_inf_d = 1; + bool iter_min = 0; PPL_DIRTY_TEMP_COEFFICIENT(tmp); for (Sequence_const_iterator si = x.sequence.begin(), s_end = x.sequence.end(); si != s_end; ++si) { - if (!si->pointset().minimize(expr, infi_n, infi_d, mini)) + if (!si->pointset().minimize(expr, iter_inf_n, iter_inf_d, iter_min)) return false; else if (first) { first = false; - inft_n = infi_n; - inft_d = infi_d; - mint = mini; + best_inf_n = iter_inf_n; + best_inf_d = iter_inf_d; + best_min = iter_min; } else { - tmp = (inft_n * infi_d) - (infi_n * inft_d); + tmp = (best_inf_n * iter_inf_d) - (iter_inf_n * best_inf_d); if (tmp > 0) { - inft_n = infi_n; - inft_d = infi_d; - mint = mini; + best_inf_n = iter_inf_n; + best_inf_d = iter_inf_d; + best_min = iter_min; } else if (tmp == 0) - mint = mint || mini; + best_min = best_min || iter_min; } } - inf_n = inft_n; - inf_d = inft_d; - minimum = mint; + inf_n = best_inf_n; + inf_d = best_inf_d; + minimum = best_min; return true; } @@ -1094,51 +1094,51 @@ Pointset_Powerset<PSET>::minimize(const Linear_Expression& expr, bool first = true; - PPL_DIRTY_TEMP_COEFFICIENT(inft_n); - PPL_DIRTY_TEMP_COEFFICIENT(inft_d); - inft_n = 0; - inft_d = 1; - bool mint = 0; + PPL_DIRTY_TEMP_COEFFICIENT(best_inf_n); + PPL_DIRTY_TEMP_COEFFICIENT(best_inf_d); + best_inf_n = 0; + best_inf_d = 1; + bool best_min = 0; Generator gt = point(); - PPL_DIRTY_TEMP_COEFFICIENT(infi_n); - PPL_DIRTY_TEMP_COEFFICIENT(infi_d); - infi_n = 0; - infi_d = 1; - bool mini = 0; + PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_n); + PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_d); + iter_inf_n = 0; + iter_inf_d = 1; + bool iter_min = 0; Generator gi = point(); PPL_DIRTY_TEMP_COEFFICIENT(tmp); for (Sequence_const_iterator si = x.sequence.begin(), s_end = x.sequence.end(); si != s_end; ++si) { - if (!si->pointset().minimize(expr, infi_n, infi_d, mini, gi)) + if (!si->pointset().minimize(expr, iter_inf_n, iter_inf_d, iter_min, gi)) return false; else if (first) { first = false; - inft_n = infi_n; - inft_d = infi_d; - mint = mini; + best_inf_n = iter_inf_n; + best_inf_d = iter_inf_d; + best_min = iter_min; gt = gi; } else { - tmp = (inft_n * infi_d) - (infi_n * inft_d); + tmp = (best_inf_n * iter_inf_d) - (iter_inf_n * best_inf_d); if (tmp > 0) { - inft_n = infi_n; - inft_d = infi_d; - mint = mini; + best_inf_n = iter_inf_n; + best_inf_d = iter_inf_d; + best_min = iter_min; gt = gi; } else if (tmp == 0) { - mint = mint || mini; + best_min = best_min || iter_min; gt = gi; } } } - inf_n = inft_n; - inf_d = inft_d; - minimum = mint; + inf_n = best_inf_n; + inf_d = best_inf_d; + minimum = best_min; g = gt; return true; }

1 0