Changeset caf8c6 in git


Ignore:
Timestamp:
Mar 22, 2018, 11:34:54 AM (5 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
556097841b7ad9fa7668ad61e04b914a898af42c
Parents:
bd0e073bf0ae20c6d66da9cd3ea1a713bb29dd6c
Message:
chg: HAVE_ASSUME -> !SING_NDEBUG
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • Singular/misc_ip.cc

    rbd0e07 rcaf8c6  
    859859              StringAppendS("YYDEBUG=1,");
    860860#endif
    861 #ifdef HAVE_ASSUME
    862              StringAppendS("ASSUME,");
    863 #endif
    864861#ifdef MDEBUG
    865862              StringAppend("MDEBUG=%d,",MDEBUG);

  • dox/Doxyfile.in

    rbd0e07 rcaf8c6  
    19891989__cplusplus \
    19901990GENTABLE \
    1991 HAVE_ASSUME \
    19921991HAVE_ATEXIT \
    19931992HAVE_BIGINTM \

  • kernel/GBEngine/kInline.h

    rbd0e07 rcaf8c6  
    758758  long ldeg;
    759759  ldeg = tailRing->pLDeg(GetLmTailRing(), &length, tailRing);
    760 #ifdef HAVE_ASSUME
     760#ifndef SING_NDEBUG
    761761  if ( pLength == 0)
    762762    p_Last(GetLmTailRing(), pLength, tailRing);

  • kernel/GBEngine/sca.cc

    rbd0e07 rcaf8c6  
    882882}
    883883
    884 #ifdef HAVE_ASSUME
    885 static int sca_mora_count = 0;
    886 #endif
    887 
    888884// ideal sca_mora (ideal F, ideal Q, intvec *w, intvec *, kStrategy strat)
    889885ideal k_sca_mora(const ideal F, const ideal Q, const intvec */*w*/, const intvec *, kStrategy strat, const ring _currRing)
    … …  
    913909#ifdef PDEBUG
    914910  assume( strat->homog == bIdHomog );
    915 #endif
    916 
    917 #ifdef HAVE_ASSUME
    918   sca_mora_count++;
    919911#endif
    920912

  • kernel/GBEngine/syz1.cc

    rbd0e07 rcaf8c6  
    379379
    380380  assume(LONG_MAX -  SYZ_SHIFT_BASE > tc[n-1]);
    381 #ifdef HAVE_ASSUME
     381#ifndef SING_NDEBUG
    382382  for (i=1; i<n; i++)
    383383  {

  • kernel/mod2.h

    rbd0e07 rcaf8c6  
    153153/* undefine to enable inline */
    154154#define NO_INLINE
    155 
    156 /* undefine to disable assume -- should normally be defined for SING_NDEBUG */
    157 #define HAVE_ASSUME
    158155
    159156/* undef PDEBUG to disable checks of polys
    … …  
    383380#endif
    384381
    385 #ifndef HAVE_ASSUME
     382#ifdef SING_NDEBUG
    386383#define assume(x) do {} while (0)
    387384#define r_assume(x) do {} while (0)
    388 #else /* ! HAVE_ASSUME */
     385#else /* SING_NDEBUG */
    389386
    390387#define assume_violation(s,f,l) \
    … …  
    414411}                                               \
    415412while (0)
    416 #endif /* HAVE_ASSUME */
     413#endif /* SING_NDEBUG */
    417414
    418415/* do have RDEBUG, unless we are doing the very real thing */
    419 #ifdef HAVE_ASSUME
     416#ifndef SING_NDEBUG
    420417#ifndef RDEBUG
    421418#define RDEBUG

  • libpolys/misc/auxiliary.h

    rbd0e07 rcaf8c6  
    160160/* undefine to enable inline */
    161161#define NO_INLINE
    162 
    163 /* undefine to disable assume -- should normally be defined for SING_NDEBUG */
    164 #define HAVE_ASSUME
    165162
    166163/* undef PDEBUG to disable checks of polys

  • libpolys/polys/monomials/p_polys.cc

    rbd0e07 rcaf8c6  
    34503450  int l = 0;
    34513451
    3452 #ifdef HAVE_ASSUME
     3452#ifndef SING_NDEBUG
    34533453  int lp = pLength(*r_p);
    34543454#endif
    … …  
    34853485  *r_q = pNext(&qq);
    34863486  *lq = l;
    3487 #ifdef HAVE_ASSUME
     3487#ifndef SING_NDEBUG
    34883488  assume(pLength(*r_p) + pLength(*r_q) == lp);
    34893489#endif

  • libpolys/polys/sbuckets.cc

    rbd0e07 rcaf8c6  
    334334poly sBucketSortMerge(poly p, const ring r)
    335335{
    336 #ifdef HAVE_ASSUME
     336  if (p == NULL || pNext(p) == NULL) return p;
     337
     338#ifndef SING_NDEBUG
    337339  int l_in = pLength(p);
    338 #endif
    339 
    340   if (p == NULL || pNext(p) == NULL) return p;
    341 
     340#endif 
    342341  sBucket_pt bucket = sBucketCreate(r);
    343342  poly pn = pNext(p);
    … …  
    358357
    359358  p_Test(pn, r);
    360 #ifdef HAVE_ASSUME
    361359  assume(l_dummy == pLength(pn));
    362360  assume(l_in == l_dummy);
    363 #endif
    364361  return pn;
    365362}
    … …  
    371368poly sBucketSortAdd(poly p, const ring r)
    372369{
    373 #ifdef HAVE_ASSUME
     370#ifndef SING_NDEBUG
    374371  int l_in = pLength(p);
    375372#endif
    … …  
    395392
    396393  p_Test(pn, r);
    397 #ifdef HAVE_ASSUME
     394#ifndef SING_NDEBUG
    398395  assume(l_dummy == pLength(pn));
    399396  assume(l_in >= l_dummy);

  • libpolys/reporter/reporter.h

    rbd0e07 rcaf8c6  
    121121#endif
    122122
    123 #ifndef HAVE_ASSUME
     123#ifdef SING_NDEBUG
    124124#define assume(x) do {} while (0)
    125125#define r_assume(x) do {} while (0)
    126 #else /* ! HAVE_ASSUME */
     126#else /* !SING_NDEBUG */
    127127
    128128#define assume_violation(s,f,l) \
    … …  
    152152}                                               \
    153153while (0)
    154 #endif /* HAVE_ASSUME */
     154#endif /* !SING_NDEBUG */
    155155
    156156#endif /* ifndef OUTPUT_H */
Note: See TracChangeset for help on using the changeset viewer.