Changeset f7d39b in git


Ignore:
Timestamp:
Sep 15, 2014, 9:12:38 PM (9 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
4ec0f01d431893a4c0997d2bdfab87cb8d37e03e
Parents:
a4771e1b7535535946d3bd424ce5c97bd0866119
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-15 21:12:38+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-23 20:08:14+02:00
Message:
Added more general id_TestTail + related cleanup for id_?(Test|Print)
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • kernel/ideals.cc

    ra4771e1 rf7d39b  
    2525#include <coeffs/coeffs.h>
    2626#include <coeffs/numbers.h>
    27 
    28 #include <kernel/polys.h>
     27// #include <coeffs/longrat.h>
     28
     29
    2930#include <polys/monomials/ring.h>
    3031#include <polys/matpol.h>
    … …  
    3738#include <kernel/ideals.h>
    3839
     40#include <kernel/polys.h>
     41
    3942#include <kernel/GBEngine/kstd1.h>
    4043#include <kernel/GBEngine/syz.h>
    41 
    42 #include <coeffs/longrat.h>
    4344
    4445

  • kernel/ideals.h

    ra4771e1 rf7d39b  
    77* ABSTRACT - all basic methods to manipulate ideals
    88*/
     9
     10#include <polys/monomials/ring.h>
     11#include <polys/monomials/p_polys.h>
    912#include <polys/simpleideals.h>
    10 #include <kernel/polys.h>
     13
     14extern ring currRing;
    1115
    1216#include <kernel/structs.h> // for tHomog
    … …  
    5458#define idSimpleAdd(A,B) id_SimpleAdd(A,B,currRing)
    5559
    56 #ifdef PDEBUG
    57 #define idTest(A) id_DBTest(A, PDEBUG, __FILE__,__LINE__,currRing)
    58 #define idPrint(id) idShow(id, currRing, currRing)
    59 #else
    60 #define idTest(A)  do {} while (0)
    61 #define idPrint(A) do {} while (0)
    62 #endif
    63 
    6460ideal id_Copy (ideal h1, const ring r);
     61
     62#define idPrint(id) id_Print(id, currRing, currRing)
     63#define idTest(id)  id_Test(id, currRing)
    6564
    6665#if 0

  • libpolys/polys/monomials/p_polys.cc

    ra4771e1 rf7d39b  
    775775{
    776776  assume(p!=NULL);
    777 #ifdef PDEBUG
    778   _p_Test(p,r,PDEBUG);
    779 #endif
     777  p_Test(p,r);
    780778  p_CheckPolyRing(p, r);
    781779  long o;
    … …  
    802800      pp = p;
    803801    }
    804 #ifdef PDEBUG
    805     _p_Test(pp,r,PDEBUG);
    806 #endif
     802    p_Test(pp,r);
    807803    o = r->pFDeg(pp, r);
    808804  }
    … …  
    14461442    return NULL;
    14471443  }
    1448   #ifdef PDEBUG
    1449   _p_Test(p,r,PDEBUG);
    1450   #endif
     1444  p_Test(p,r);
    14511445  ok=!errorreported;
    14521446  return p;
    … …  
    20402034    p_MonPower(p,exp,r);
    20412035    p_MonPower(tail,exp,r);
    2042 #ifdef PDEBUG
    20432036    p_Test(p,r);
    2044 #endif
    20452037    return p;
    20462038  }
    … …  
    20892081//     pIter(tail);
    20902082// }
    2091 #ifdef PDEBUG
    20922083  p_Test(res,r);
    2093 #endif
    20942084  return res;
    20952085}

  • libpolys/polys/simpleideals.cc

    ra4771e1 rf7d39b  
    417417
    418418#ifdef PDEBUG
    419 void id_DBTest(ideal h1, int level, const char *f,const int l, const ring r)
     419void id_DBTest(ideal h1, int level, const char *f,const int l, const ring r, const ring tailRing)
    420420{
    421421  int i;
    … …  
    426426    omCheckAddrSize(h1,sizeof(*h1));
    427427    omdebugAddrSize(h1->m,h1->ncols*h1->nrows*sizeof(poly));
     428     
    428429    /* to be able to test matrices: */
    429430    for (i=(h1->ncols*h1->nrows)-1; i>=0; i--)
    430       _p_Test(h1->m[i], r, level);
    431     int new_rk=id_RankFreeModule(h1,r);
     431      _pp_Test(h1->m[i], r, tailRing, level);
     432     
     433    int new_rk=id_RankFreeModule(h1, r, tailRing);
    432434    if(new_rk > h1->rank)
    433435    {

  • libpolys/polys/simpleideals.h

    ra4771e1 rf7d39b  
    6363
    6464#ifdef PDEBUG
    65 void id_DBTest(ideal h1, int level, const char *f,const int l, const ring r);
    66 #define id_Test(A, r) id_DBTest(A, PDEBUG, __FILE__,__LINE__, r)
    67 // #define id_Print(id, r) id_Show(id, r)
     65void id_DBTest(ideal h1, int level, const char *f,const int l, const ring lR, const ring tR );
     66#define id_TestTail(A, lR, tR) id_DBTest(A, PDEBUG, __FILE__,__LINE__, lR, tR)
     67#define id_Test(A, lR) id_DBTest(A, PDEBUG, __FILE__,__LINE__, lR, lR)
    6868#else
    69 #define id_Test(A, r)  do {} while (0)
    70 // #define id_Print(A, r) do {} while (0)
     69#define id_TestTail(A, lR, tR)  do {} while (0)
     70#define id_Test(A, lR) do {} while (0)
    7171#endif
    7272
    … …  
    131131#ifdef PDEBUG
    132132void idShow(const ideal id, const ring lmRing, const ring tailRing, const int debugPrint = 0);
     133#define id_Print(id, lR, tR) idShow(id, lR, tR)
     134#else
     135#define id_Print(A, lR, tR) do {} while (0)
    133136#endif
     137
    134138
    135139
Note: See TracChangeset for help on using the changeset viewer.