Changeset 74161f1 in git


Ignore:
Timestamp:
Mar 1, 2018, 10:51:40 AM (5 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')
Children:
f596991daf3bd5b413c1903c2e045790b58a2c9f
Parents:
7b0641e83ca14a3d6ea643856136e6aee7e1d1e1
Message:
opt: pNormalize/pCleardenom in slimgb
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/GBEngine/tgb.cc

    r7b0641 r74161f1  
    6060{
    6161  assume (r == currRing);
    62   if(!rField_is_Zp (r))
     62  if(TEST_OPT_INTSTRATEGY)
    6363  {
    6464    p_Cleardenom (p, r);
     
    983983  if(!(simplified))
    984984  {
    985     if(!rField_is_Zp (c->r))
     985    if(TEST_OPT_INTSTRATEGY)
    986986    {
    987987      p_Cleardenom (P.p, c->r); //includes p_Content(P.p,c->r );
     
    989989    else
    990990      pNorm (P.p);
    991     pNormalize (P.p);
     991    //pNormalize (P.p);
    992992  }
    993993  wlen_type pq = pQuality (h, c, len);
     
    15051505  //necessary for correct weighted length
    15061506
    1507   if(!rField_is_Zp (c->r))
     1507  if(TEST_OPT_INTSTRATEGY)
    15081508  {
    15091509    p_Cleardenom (h, c->r); //includes p_Content(h,c->r);
     
    15111511  else
    15121512    pNorm (h);
    1513   pNormalize (h);
     1513  //pNormalize (h);
    15141514
    15151515  c->weighted_lengths[i] = pQuality (h, c, c->lengths[i]);
     
    37743774        h = S->m[i];
    37753775        h = redNFTail (h, strat->sl, strat, lengths[i]);
    3776         if(!rField_is_Zp (r))
     3776        if(TEST_OPT_INTSTRATEGY)
    37773777        {
    37783778          p_Cleardenom (h, r); //includes p_Content(h,r);
     
    43634363    if(c->strat->lenSw != NULL)
    43644364      c->strat->lenSw[j] = qal;
    4365     if(!rField_is_Zp (c->r))
     4365    if(TEST_OPT_INTSTRATEGY)
    43664366    {
    43674367      p_Cleardenom (clear_into, c->r);  //should be unnecessary
     
    48724872    kBucketSimpleContent (r[i].bucket);
    48734873    r[i].validate ();
    4874 #ifdef TGB_DEBUG
    4875 #endif
    48764874  }
    48774875}
     
    49124910    kBucketClear (r[rn].bucket, &red, &red_len);
    49134911
    4914     if(!rField_is_Zp (c->r))
     4912    if(TEST_OPT_INTSTRATEGY)
    49154913    {
    49164914      p_Cleardenom (red, c->r); //should be unnecessary
    49174915      //includes p_Content(red, c->r);
    49184916    }
    4919     pNormalize (red);
     4917    //pNormalize (red);
    49204918
    49214919    if((!(erg.fromS)) && (TEST_V_UPTORADICAL))
Note: See TracChangeset for help on using the changeset viewer.