Changeset 576f5b in git


Ignore:
Timestamp:
Nov 25, 2013, 4:57:13 PM (9 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
c91ffe336985180edd91ef17bf401793443ccb4d
Parents:
b085fbae2501ff545f48d2d74ab896e6c2343f5b
git-author:
Christian Eder <ederc@mathematik.uni-kl.de>2013-11-25 16:57:13+01:00
git-committer:
Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:25+01:00
Message:
workin sba tail reduction (disabled by default)
Location:
kernel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/kInline.h

    rb085fba r576f5b  
    10811081  assume(PR->GetLmCurrRing() != PW->GetLmCurrRing());
    10821082  Red->HeadNormalize();
     1083  /*
    10831084  printf("------------------------\n");
    10841085  pWrite(Red->GetLmCurrRing());
     1086  */
    10851087  ret = ksReducePolySig(Red, PW, 1, NULL, &coef);
    1086   if (ret == 3) {
    1087     pWrite(Red->GetLmCurrRing());
    1088     printf("not sig-safe\n");
    1089     printf("------------------------\n");
    1090   }
    10911088  if (!ret)
    10921089  {
  • kernel/kspoly.cc

    rb085fba r576f5b  
    262262      return 3;
    263263    }
    264     PW->is_sigsafe  = TRUE;
     264    //PW->is_sigsafe  = TRUE;
    265265  }
    266266  PR->is_redundant = FALSE;
  • kernel/kstd2.cc

    rb085fba r576f5b  
    15761576  int hilbeledeg=1,hilbcount=0,minimcnt=0;
    15771577  LObject L;
    1578   BOOLEAN withT     = FALSE;
     1578  BOOLEAN withT     = TRUE;
    15791579  strat->max_lower_index = 0;
    15801580
     
    17701770        if (!kStratChangeTailRing(strat)) { Werror("OVERFLOW.."); break;}
    17711771    }
    1772     if (strat->incremental)
    1773     {
    1774       for (int jj = 0; jj<strat->tl+1; jj++)
    1775       {
    1776         if (pGetComp(strat->T[jj].sig) == strat->currIdx)
    1777         {
    1778           strat->T[jj].is_sigsafe = FALSE;
    1779         }
    1780       }
    1781     }
    1782     else
    1783     {
    1784       for (int jj = 0; jj<strat->tl+1; jj++)
    1785       {
    1786         strat->T[jj].is_sigsafe = FALSE;
    1787       }
    1788     }
    17891772
    17901773    // reduction to non-zero new poly
     
    18201803      // therefore we call pContent instead of pNorm
    18211804#if SBA_TAIL_RED
    1822       pWrite(strat->P.p);
    18231805      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
    18241806      {
     
    18361818          strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
    18371819      }
    1838       pWrite(strat->P.p);
    1839       printf("-\n");
    1840 #endif
     1820#endif
     1821
     1822    // remove sigsafe label since it is no longer valid for the next element to
     1823    // be reduced
     1824    if (strat->incremental)
     1825    {
     1826      for (int jj = 0; jj<strat->tl+1; jj++)
     1827      {
     1828        if (pGetComp(strat->T[jj].sig) == strat->currIdx)
     1829        {
     1830          strat->T[jj].is_sigsafe = FALSE;
     1831        }
     1832      }
     1833    }
     1834    else
     1835    {
     1836      for (int jj = 0; jj<strat->tl+1; jj++)
     1837      {
     1838        strat->T[jj].is_sigsafe = FALSE;
     1839      }
     1840    }
    18411841#ifdef KDEBUG
    18421842      if (TEST_OPT_DEBUG){PrintS("new s:");strat->P.wrp();PrintLn();}
     
    19381938      // posInS only depends on the leading term
    19391939      strat->enterS(strat->P, pos, strat, strat->tl);
    1940 #if 1
    1941 //#if DEBUGF50
     1940//#if 1
     1941#if DEBUGF50
    19421942    printf("---------------------------\n");
    19431943    Print(" %d. ELEMENT ADDED TO GCURR:\n",strat->sl+1);
Note: See TracChangeset for help on using the changeset viewer.