Changeset af66d6 in git


Ignore:
Timestamp:
Aug 3, 2011, 7:36:56 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
Children:
1e872a8ed7451934142b28236ec124f6235b5679
Parents:
f218a7daf5f60792a940256fb8358b13d4d85ef3
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 19:36:56+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:22+01:00
Message:
FIX: most Syzygy-related (e.g. *Comps) functions need a ring now
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • kernel/syz0.cc

    rf218a7 raf66d6  
    208208/*----------------construction of the new ordering----------*/
    209209  if (rkF>0)
    210     rSetSyzComp(rkF);
     210    rSetSyzComp(rkF, currRing);
    211211  else
    212     rSetSyzComp(1);
     212    rSetSyzComp(1, currRing);
    213213/*----------------creating S--------------------------------*/
    214214  for(j=0;j<Fl;j++)
     
    840840static void idShift(ideal arg,int index)
    841841{
    842   int i,j=rGetMaxSyzComp(index);
     842  int i,j=rGetMaxSyzComp(index, currRing);
    843843  for (i=0;i<IDELEMS(arg);i++)
    844844  {
  • kernel/syz1.cc

    rf218a7 raf66d6  
    421421    int* prev_c;
    422422    int p_length;
    423     rGetSComps(&prev_c, &prev_s, &p_length);
     423    rGetSComps(&prev_c, &prev_s, &p_length, currRing);
    424424    currcomponents = syzstr->truecomponents[index-1];
    425425    currShiftedComponents = syzstr->ShiftedComponents[index-1];
    426426    rChangeSComps(currcomponents,
    427427                  currShiftedComponents,
    428                   IDELEMS(syzstr->res[index-1]));
     428                  IDELEMS(syzstr->res[index-1]), currRing);
    429429    if (hilb==0)
    430430    {
     
    456456    currcomponents  = prev_c;
    457457    currShiftedComponents = prev_s;
    458     rChangeSComps(prev_c, prev_s, p_length);
     458    rChangeSComps(prev_c, prev_s, p_length, currRing);
    459459  }
    460460}
     
    16451645    {
    16461646      if(syzstr->syRing->typ[1].ord_typ == ro_syzcomp)
    1647         rNChangeSComps(NULL, NULL, syzstr->syRing);
     1647        rChangeSComps(NULL, NULL, 0, syzstr->syRing);
    16481648
    16491649      rKill(syzstr->syRing);
     
    23572357      currShiftedComponents = syzstr->ShiftedComponents[index];
    23582358      rChangeSComps(currcomponents, currShiftedComponents,
    2359                     IDELEMS(syzstr->res[index]));
     2359                    IDELEMS(syzstr->res[index]), currRing);
    23602360      sPairs = syzstr->resPairs[index];
    23612361      Strip = syToStrip(syzstr,index);
     
    23822382  currShiftedComponents = syzstr->ShiftedComponents[0];
    23832383  rChangeSComps( currcomponents, currShiftedComponents,
    2384                  IDELEMS(syzstr->res[0]));
     2384                 IDELEMS(syzstr->res[0]), currRing);
    23852385  tres[1] = idInit(IDELEMS(syzstr->res[1]),syzstr->res[1]->rank);
    23862386  sPairs = syzstr->resPairs[0];
     
    24792479    currcomponents[i] = i;
    24802480  }
    2481   rChangeSComps(currcomponents, currShiftedComponents, arg->rank);
     2481  rChangeSComps(currcomponents, currShiftedComponents, arg->rank, syzstr->syRing);
    24822482/*--- initializes the data structures---------------*/
    24832483  syzstr->Tl = new intvec(*length);
     
    25252525    currShiftedComponents = syzstr->ShiftedComponents[si_max(index-1,0)];
    25262526    rChangeSComps(currcomponents, currShiftedComponents,
    2527                   IDELEMS(syzstr->res[si_max(index-1,0)]));
     2527                  IDELEMS(syzstr->res[si_max(index-1,0)]), currRing);
    25282528    j = syInitSyzMod(syzstr,index+1);
    25292529    if (index>0)
     
    26212621    currcomponents[i] = i;
    26222622  }
    2623   rChangeSComps(currcomponents, currShiftedComponents, arg->rank);
     2623  rChangeSComps(currcomponents, currShiftedComponents, arg->rank, currRing);
    26242624/*--- initializes the data structures---------------*/
    26252625  syzstr->Tl = new intvec(maxlength);
     
    26732673    currShiftedComponents = syzstr->ShiftedComponents[si_max(index-1,0)];
    26742674    rChangeSComps(currcomponents, currShiftedComponents,
    2675                   IDELEMS(syzstr->res[si_max(index-1,0)]));
     2675                  IDELEMS(syzstr->res[si_max(index-1,0)]), currRing);
    26762676    j = syInitSyzMod(syzstr,index+1);
    26772677    if (index>0)
  • libpolys/polys/monomials/ring.cc

    rf218a7 raf66d6  
    42044204* change the block to reflect the sequence given by appending v
    42054205*/
    4206 
     4206static inline void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r)
     4207{
     4208  assume(r->typ[1].ord_typ == ro_syzcomp);
     4209
     4210  r->typ[1].data.syzcomp.ShiftedComponents = currShiftedComponents;
     4211  r->typ[1].data.syzcomp.Components = currComponents;
     4212}
     4213
     4214static inline void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r)
     4215{
     4216  assume(r->typ[1].ord_typ == ro_syzcomp);
     4217
     4218  *currShiftedComponents = r->typ[1].data.syzcomp.ShiftedComponents;
     4219  *currComponents =   r->typ[1].data.syzcomp.Components;
     4220}
    42074221#ifdef PDEBUG
    4208 void rDBChangeSComps(int* currComponents,
     4222static inline void rDBChangeSComps(int* currComponents,
    42094223                     long* currShiftedComponents,
    42104224                     int length,
     
    42164230  rNChangeSComps( currComponents, currShiftedComponents, r);
    42174231}
    4218 void rDBGetSComps(int** currComponents,
     4232static inline void rDBGetSComps(int** currComponents,
    42194233                 long** currShiftedComponents,
    42204234                 int *length,
     
    42284242#endif
    42294243
    4230 void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r)
    4231 {
    4232   assume(r->typ[1].ord_typ == ro_syzcomp);
    4233 
    4234   r->typ[1].data.syzcomp.ShiftedComponents = currShiftedComponents;
    4235   r->typ[1].data.syzcomp.Components = currComponents;
    4236 }
    4237 
    4238 void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r)
    4239 {
    4240   assume(r->typ[1].ord_typ == ro_syzcomp);
    4241 
    4242   *currShiftedComponents = r->typ[1].data.syzcomp.ShiftedComponents;
    4243   *currComponents =   r->typ[1].data.syzcomp.Components;
    4244 }
     4244void rChangeSComps(int* currComponents, long* currShiftedComponents, int length, ring r)
     4245{
     4246#ifdef PDEBUG
     4247   rDBChangeSComps(currComponents, currShiftedComponents, length, r);
     4248#else
     4249   rNChangeSComps(currComponents, currShiftedComponents, r);
     4250#endif
     4251}
     4252
     4253void rGetSComps(int** currComponents, long** currShiftedComponents, int *length, ring r)
     4254{
     4255#ifdef PDEBUG
     4256   rDBGetSComps(currComponents, currShiftedComponents, length, r);
     4257#else
     4258   rNGetSComps(currComponents, currShiftedComponents, r);
     4259#endif
     4260}
     4261
    42454262
    42464263/////////////////////////////////////////////////////////////////////////////
  • libpolys/polys/monomials/ring.h

    rf218a7 raf66d6  
    380380
    381381// The following are for LaScala3 only!
    382 #ifdef PDEBUG
    383 #define rChangeSComps(c,s,l) rDBChangeSComps(c,s,l)
    384 #define rGetSComps(c,s,l) rDBGetSComps(c,s,l)
    385 void rDBChangeSComps(int* currComponents,
    386                      long* currShiftedComponents,
    387                      int length,
    388                      ring r);
    389 void rDBGetSComps(int** currComponents,
    390                   long** currShiftedComponents,
    391                   int *length,
    392                   ring r);
    393 #else
    394 #define rChangeSComps(c,s,l) rNChangeSComps(c,s)
    395 #define rGetSComps(c,s,l) rNGetSComps(c,s)
    396 #endif
    397 
    398 void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r);
    399 void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r);
     382void rChangeSComps(int* currComponents, long* currShiftedComponents, int length, ring r);
     383void rGetSComps(int** currComponents, long** currShiftedComponents, int *length, ring r);
     384
     385
    400386
    401387//idhdl  rFindHdl(ring r, idhdl n, idhdl w);
Note: See TracChangeset for help on using the changeset viewer.