Changeset 572022 in git


Ignore:
Timestamp:
Aug 2, 2021, 1:35:14 AM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
a33602e61791ac74aa02b273dba03a1e492f75b0
Parents:
dd0db24b6d16696e253c280d1a996df58bc2b913
Message:
opt: unify kHEdge and kNoether
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • Singular/extra.cc

    rdd0db24 r572022  
    38503850    }
    38513851    else
    3852 /*==================== HCpoly =================*/
    3853     if (strcmp(sys_cmd,"HCpoly")==0)
    3854     {
    3855       if (h->Typ()!=POLY_CMD) return TRUE;
    3856       pDelete(&HCtest);
    3857       HCtest=(poly)h->CopyD();
    3858       return FALSE;
    3859     }
    3860     else
    38613852/*==================== Error =================*/
    38623853      Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );

  • Singular/walk.cc

    rdd0db24 r572022  
    319319    completeReduce(strat);
    320320  }
    321   if(strat->kHEdge!=NULL) pLmFree(&strat->kHEdge);
     321  if(strat->kNoether!=NULL) pLmFree(&strat->kNoether);
    322322  omFreeSize((ADDRESS)strat->T,strat->tmax*sizeof(TObject));
    323323  omFreeSize((ADDRESS)strat->ecartS,IDELEMS(strat->Shdl)*sizeof(int));

  • kernel/GBEngine/kChinese.cc

    rdd0db24 r572022  
    6464  if (((*d)&1)==1) // immidiate number
    6565  {
    66     *n=(number)(*d); 
     66    *n=(number)(*d);
    6767  }
    6868  else
    … …  
    101101  else
    102102  {
    103     if (n->s==3) 
     103    if (n->s==3)
    104104    {
    105105      ll+=SIZEOF_LONG*2; /* n->s, mpz size */
    … …  
    296296  int cnt=IDELEMS(x)*x->nrows;
    297297  int cpus=(int)(long)feOptValue(FE_OPT_CPUS);
    298   if (2*cpus>=cnt) /* at least 2 polys for each process, 
     298  if (2*cpus>=cnt) /* at least 2 polys for each process,
    299299                     or switch to seriell version */
    300300    return id_Farey(x,N,r);

  • kernel/GBEngine/kstd1.cc

    rdd0db24 r572022  
    9393                |Sy_bit(31);
    9494
    95 VAR poly HCtest=NULL;
    9695//static BOOLEAN posInLOldFlag;
    9796           /*FALSE, if posInL == posInL10*/
    … …  
    18731872  strat->update = TRUE;
    18741873  /*- setting global variables ------------------- -*/
    1875   if (HCtest!=NULL)
    1876   {
    1877     strat->kNoether=pCopy(HCtest);
    1878     strat->kHEdgeFound=TRUE;
    1879     strat->update=TRUE;
    1880   }
    18811874  initBuchMoraCrit(strat);
    18821875  initHilbCrit(F,Q,&hilb,strat);
    … …  
    18931886  {
    18941887    strat->kHEdgeFound = TRUE;
     1888    strat->kNoether=pCopy(currRing->ppNoether);
    18951889  }
    18961890  if (strat->kHEdgeFound && strat->update)
    … …  
    19151909    if(!idIs0(F) &&(!rField_is_Ring(currRing)))
    19161910      kStratInitChangeTailRing(strat);
    1917   if(strat->kNoether!=NULL)
    1918   {
    1919     strat->t_kNoether = k_LmInit_currRing_2_tailRing(strat->kNoether, strat->tailRing);
     1911  if(strat->kNoether!=NULL)
     1912  {
    19201913    firstUpdate(strat);
    19211914    /*- cuts elements in L above noether and reorders L -*/
    … …  
    20832076      }
    20842077    }
     2078    HCord=strat->HCord;
    20852079    kTest_TS(strat);
    20862080  }
    … …  
    20932087  if (TEST_OPT_FINDET)
    20942088  {
    2095     if (strat->kHEdge!=NULL)
    2096       Kstd1_mu=currRing->pFDeg(strat->kHEdge,currRing);
     2089    if (strat->kNoether!=NULL)
     2090      Kstd1_mu=currRing->pFDeg(strat->kNoether,currRing);
    20972091    else
    20982092      Kstd1_mu=-1;
    20992093  }
    2100   if (strat->kHEdge!=NULL) pLmFree(&strat->kHEdge);
     2094  if (strat->kNoether!=NULL) pLmFree(&strat->kNoether);
    21012095  strat->update = TRUE; //???
    21022096  strat->lastAxis = 0; //???
    … …  
    22482242    strat->fromQ=NULL;
    22492243  }
    2250   if (strat->kHEdge!=NULL) pLmFree(&strat->kHEdge);
    2251   if (strat->kNoether!=NULL) pLmDelete(&strat->kNoether);
     2244  if (strat->kNoether!=NULL) pLmFree(&strat->kNoether);
    22522245//  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
    22532246//  {
    … …  
    24002393    strat->fromQ=NULL;
    24012394  }
    2402   if (strat->kHEdge!=NULL) pLmFree(&strat->kHEdge);
    2403   if (strat->kNoether!=NULL) pLmDelete(&strat->kNoether);
     2395  if (strat->kNoether!=NULL) pLmFree(&strat->kNoether);
    24042396//  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
    24052397//  {
    … …  
    26222614  currRing->pLexOrder = b;
    26232615//Print("%d reductions canceled \n",strat->cel);
    2624   HCord=strat->HCord;
    26252616  delete(strat);
    26262617  if ((delete_w)&&(w!=NULL)&&(*w!=NULL)) delete *w;
    … …  
    27552746    currRing->pLexOrder = b;
    27562747  //Print("%d reductions canceled \n",strat->cel);
    2757     HCord=strat->HCord;
    27582748    //delete(strat);
    27592749    if ((delete_w)&&(w!=NULL)&&(*w!=NULL)) delete *w;
    … …  
    29072897      currRing->pLexOrder = b;
    29082898    //Print("%d reductions canceled \n",strat->cel);
    2909       HCord=strat->HCord;
    29102899      sigdrop = strat->sigdrop;
    29112900      sbaEnterS = strat->sbaEnterS;
    … …  
    30193008  currRing->pLexOrder = b;
    30203009//Print("%d reductions canceled \n",strat->cel);
    3021   HCord=strat->HCord;
    30223010  delete(strat);
    30233011  if ((delete_w)&&(w!=NULL)&&(*w!=NULL)) delete *w;
    … …  
    31473135  }
    31483136  currRing->pLexOrder = b;
    3149   HCord=strat->HCord;
    31503137  if ((delete_w)&&(temp_w!=NULL)) delete temp_w;
    31513138  if ((IDELEMS(r)==1) && (r->m[0]!=NULL) && pIsConstant(r->m[0]) && (strat->ak==0))
    … …  
    34593446  //else if (TEST_OPT_PROT) PrintLn();
    34603447  cleanT(strat);
    3461   if (strat->kHEdge!=NULL) pLmFree(&strat->kHEdge);
     3448  if (strat->kNoether!=NULL) pLmFree(&strat->kNoether);
    34623449  omFreeSize((ADDRESS)strat->T,strat->tmax*sizeof(TObject));
    34633450  omFreeSize((ADDRESS)strat->ecartS,IDELEMS(strat->Shdl)*sizeof(int));

  • kernel/GBEngine/kstd1.h

    rdd0db24 r572022  
    4747//extern int syzComp;
    4848  /*stop building pairs after that component --> ideals.cc, syz.cc */
    49 EXTERN_VAR int LazyPass,LazyDegree,Kstd1_mu,Kstd1_deg;
    50 EXTERN_VAR poly HCtest;
    51   /*parameters for Lazy or global stops --> ipshell.cc, grammar.y*/
     49EXTERN_VAR int Kstd1_mu,Kstd1_deg;
     50  /*parameters for global stops --> ipshell.cc, grammar.y*/
    5251EXTERN_VAR BITSET kOptions;
    5352  /*the known test options (a constant)*/

  • kernel/GBEngine/kstdfac.cc

    rdd0db24 r572022  
    186186  copyL(o,s);//s->L=...
    187187  s->B=initL();
    188   s->kHEdge=pCopy(o->kHEdge);
    189188  s->kNoether=pCopy(o->kNoether);
    190189  if (o->NotUsedAxis!=NULL)

  • kernel/GBEngine/kutil.cc

    rdd0db24 r572022  
    246246VAR int     HCord;
    247247VAR int     Kstd1_deg;
    248 VAR int     Kstd1_mu=32000;
     248VAR int     Kstd1_mu=INT_MAX;
    249249
    250250/*2
    … …  
    97439743  {
    97449744    strat->sugarCrit = FALSE;
    9745     strat->Gebauer = FALSE ;
     9745    strat->Gebauer = FALSE;
    97469746    strat->honey = FALSE;
    97479747  }
    … …  
    1001810018{
    1001910019  strat->interpt = BTEST1(OPT_INTERRUPT);
    10020   strat->kHEdge=NULL;
    10021   if (rHasGlobalOrdering(currRing)) strat->kHEdgeFound=FALSE;
    1002210020  /*- creating temp data structures------------------- -*/
    10023   strat->cp = 0;
    10024   strat->c3 = 0;
     10021  //strat->cp = 0; // already by skStragy()
     10022  //strat->c3 = 0; // already by skStragy()
    1002510023#ifdef HAVE_SHIFTBBA
    10026   strat->cv = 0;
     10024  strat->cv = 0; // already by skStragy()
    1002710025#endif
    1002810026  strat->tail = pInit();
    … …  
    1004410042  strat->sevT = initsevT();
    1004510043  /*- init local data struct.---------------------------------------- -*/
    10046   strat->P.ecart=0;
    10047   strat->P.length=0;
    10048   strat->P.pLength=0;
     10044  //strat->P.ecart=0; // already by skStragy()
     10045  //strat->P.length=0; // already by skStragy()
     10046  //strat->P.pLength=0; // already by skStragy()
    1004910047  if (rHasLocalOrMixedOrdering(currRing))
    1005010048  {
    10051     if (strat->kHEdge!=NULL) pSetComp(strat->kHEdge, strat->ak);
    10052     if (strat->kNoether!=NULL) pSetComp(strat->kNoetherTail(), strat->ak);
     10049    if (strat->kNoether!=NULL)
     10050    {
     10051      pSetComp(strat->kNoether, strat->ak);
     10052      pSetComp(strat->kNoetherTail(), strat->ak);
     10053    }
    1005310054  }
    1005410055  if(rField_is_Ring(currRing))
    … …  
    1023010231{
    1023110232  strat->interpt = BTEST1(OPT_INTERRUPT);
    10232   strat->kHEdge=NULL;
     10233  strat->kNoether=NULL;
    1023310234  if (rHasGlobalOrdering(currRing)) strat->kHEdgeFound=FALSE;
    1023410235  /*- creating temp data structures------------------- -*/
    … …  
    1025910260  if (rHasLocalOrMixedOrdering(currRing))
    1026010261  {
    10261     if (strat->kHEdge!=NULL) pSetComp(strat->kHEdge, strat->ak);
    10262     if (strat->kNoether!=NULL) pSetComp(strat->kNoetherTail(), strat->ak);
     10262    if (strat->kNoether!=NULL)
     10263    {
     10264      pSetComp(strat->kNoether, strat->ak);
     10265      pSetComp(strat->kNoetherTail(), strat->ak);
     10266    }
    1026310267  }
    1026410268  if(rField_is_Ring(currRing))
    … …  
    1067110675
    1067210676/*2
    10673 * computes the new strat->kHEdge and the new pNoether,
     10677* computes the new strat->kNoether and the new pNoether,
    1067410678* returns TRUE, if pNoether has changed
    1067510679*/
    … …  
    1068310687#if 0
    1068410688  if (currRing->weight_all_1)
    10685     scComputeHC(strat->Shdl,NULL,strat->ak,strat->kHEdge, strat->tailRing);
     10689    scComputeHC(strat->Shdl,NULL,strat->ak,strat->kNoether, strat->tailRing);
    1068610690  else
    10687     scComputeHCw(strat->Shdl,NULL,strat->ak,strat->kHEdge, strat->tailRing);
     10691    scComputeHCw(strat->Shdl,NULL,strat->ak,strat->kNoether, strat->tailRing);
    1068810692#else
    10689   scComputeHC(strat->Shdl,NULL,strat->ak,strat->kHEdge, strat->tailRing);
    10690 #endif
    10691   if (strat->kHEdge==NULL) return FALSE;
    10692   if (strat->t_kHEdge != NULL)
    10693   {
    10694     p_LmFree(strat->t_kHEdge, strat->tailRing);
    10695     strat->t_kHEdge=NULL;
     10693  scComputeHC(strat->Shdl,NULL,strat->ak,strat->kNoether, strat->tailRing);
     10694#endif
     10695  if (strat->kNoether==NULL) return FALSE;
     10696  if (strat->t_kNoether != NULL)
     10697  {
     10698    p_LmFree(strat->t_kNoether, strat->tailRing);
     10699    strat->t_kNoether=NULL;
    1069610700  }
    1069710701  if (strat->tailRing != currRing)
    10698     strat->t_kHEdge = k_LmInit_currRing_2_tailRing(strat->kHEdge, strat->tailRing);
     10702    strat->t_kNoether = k_LmInit_currRing_2_tailRing(strat->kNoether, strat->tailRing);
    1069910703  /* compare old and new noether*/
    10700   newNoether = pLmInit(strat->kHEdge);
     10704  newNoether = pLmInit(strat->kNoether);
    1070110705  pSetCoeff0(newNoether,nInit(1));
    1070210706  j = p_FDeg(newNoether,currRing);
    … …  
    1071810722    {
    1071910723      Print("H(%d):",j);
    10720       wrp(strat->kHEdge);
     10724      wrp(strat->kNoether);
    1072110725      PrintLn();
    1072210726    }
    … …  
    1131311317    = pGetShallowCopyDeleteProc(currRing, new_tailRing);
    1131411318
    11315   if (strat->kHEdge != NULL)
    11316   {
    11317     if (strat->t_kHEdge != NULL)
    11318       p_LmFree(strat->t_kHEdge, strat->tailRing);
    11319     strat->t_kHEdge=k_LmInit_currRing_2_tailRing(strat->kHEdge, new_tailRing);
    11320   }
    11321 
    1132211319  if (strat->kNoether != NULL)
    1132311320  {
    1132411321    if (strat->t_kNoether != NULL)
    1132511322      p_LmFree(strat->t_kNoether, strat->tailRing);
    11326     strat->t_kNoether=k_LmInit_currRing_2_tailRing(strat->kNoether,
    11327                                                    new_tailRing);
    11328   }
     11323    strat->t_kNoether=k_LmInit_currRing_2_tailRing(strat->kNoether, new_tailRing);
     11324  }
     11325
    1132911326  kTest_TS(strat);
    1133011327  if (TEST_OPT_PROT)
    … …  
    1161111608                            ((tailRing != NULL) ? tailRing->PolyBin:
    1161211609                             currRing->PolyBin));
    11613   if (t_kHEdge != NULL)
    11614     p_LmFree(t_kHEdge, tailRing);
    1161511610  if (t_kNoether != NULL)
    1161611611    p_LmFree(t_kNoether, tailRing);

  • kernel/GBEngine/kutil.h

    rdd0db24 r572022  
    266266  KINLINE void HeadNormalize();
    267267};
    268 
    269268
    270269EXTERN_VAR int HCord;
    … …  
    328327  LSet L;
    329328  LSet    B;
    330   poly    kHEdge;
    331329  poly    kNoether;
    332   poly    t_kHEdge; // same polys in tailring
     330  poly    t_kNoether; // same polys in tailring
    333331  KINLINE poly    kNoetherTail();
    334   poly    t_kNoether;
    335332  BOOLEAN * NotUsedAxis;
    336333  BOOLEAN * pairtest;/*used for enterOnePair*/

  • kernel/GBEngine/sca.cc

    rdd0db24 r572022  
    11801180  if (TEST_OPT_FINDET)
    11811181  {
    1182     if (strat->kHEdge!=NULL)
    1183       Kstd1_mu=currRing->pFDeg(strat->kHEdge,currRing);
     1182    if (strat->kNoether!=NULL)
     1183      Kstd1_mu=currRing->pFDeg(strat->kNoether,currRing);
    11841184    else
    11851185      Kstd1_mu=-1;
    11861186  }
    1187   if(strat->kHEdge!=NULL) pLmFree(&strat->kHEdge);
     1187  if(strat->kNoether!=NULL) pLmFree(&strat->kNoether);
    11881188  strat->update = TRUE; //???
    11891189  strat->lastAxis = 0; //???
    1190   pDelete(&strat->kNoether);
    11911190  omFreeSize((ADDRESS)strat->NotUsedAxis,(rVar(currRing)+1)*sizeof(BOOLEAN));
    11921191  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
Note: See TracChangeset for help on using the changeset viewer.