Changeset 34183a in git

Timestamp:

Jul 7, 2016, 3:08:59 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

a1299c28602fe2bb5ab848f4dd82bb5d10a66412c66a53f1b58e7f846551ad48a7866b06bf852f5fcd79608c61d713b22b8e9ae861168cbd02e4fab9

Parents:

382febc4b9c1d345489e23122c487898797e979d

Message:

removed idSize -> idElem/IDELEMS

Files:

• Singular/dyn_modules/gfanlib/flip.cc (modified) (2 diffs)
• Singular/dyn_modules/gfanlib/groebnerComplex.cc (modified) (1 diff)
• Singular/dyn_modules/gfanlib/groebnerCone.cc (modified) (5 diffs)
• Singular/dyn_modules/gfanlib/groebnerFan.cc (modified) (1 diff)
• Singular/dyn_modules/gfanlib/initial.cc (modified) (4 diffs)
• Singular/dyn_modules/gfanlib/lift.cc (modified) (3 diffs)
• Singular/dyn_modules/gfanlib/ppinitialReduction.cc (modified) (12 diffs)
• Singular/dyn_modules/gfanlib/startingCone.cc (modified) (11 diffs)
• Singular/dyn_modules/gfanlib/tropical.cc (modified) (2 diffs)
• Singular/dyn_modules/gfanlib/tropicalCurves.cc (modified) (2 diffs)
• Singular/dyn_modules/gfanlib/tropicalStrategy.cc (modified) (16 diffs)
• Singular/dyn_modules/gfanlib/tropicalStrategy.h (modified) (1 diff)
• Singular/dyn_modules/gfanlib/tropicalVariety.cc (modified) (1 diff)
• Singular/dyn_modules/gfanlib/witness.cc (modified) (2 diffs)
• Singular/dyn_modules/syzextra/mod_main.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (2 diffs)
• kernel/GBEngine/nc.cc (modified) (1 diff)
• kernel/GBEngine/syz1.cc (modified) (1 diff)
• kernel/ideals.h (modified) (1 diff)
• libpolys/polys/simpleideals.cc (modified) (1 diff)

Singular/dyn_modules/gfanlib/flip.cc

@@ -68 +68 @@
   /* compute initial ideal and map it to the new ordering */
   ideal inIr = initial(I,r,interiorPoint);
-  int k = idSize(I); ideal inIsAdjusted = idInit(k);
+  int k = IDELEMS(I); ideal inIsAdjusted = idInit(k);
   for (int i=0; i<k; i++)
-    inIsAdjusted->m[i] = p_PermPoly(inIr->m[i],NULL,r,sAdjusted,identity,NULL,0);
+  {
+    if (inIr->m[i]!=NULL)
+    {
+      inIsAdjusted->m[i] = p_PermPoly(inIr->m[i],NULL,r,sAdjusted,identity,NULL,0);
+    }
+  }
   id_Delete(&inIr,r);
 
@@ -104 +109 @@
   rTest(s);
   identity = n_SetMap(sAdjusted->cf,s->cf);
-  k = idSize(IsAdjustedGB); ideal IsGB = idInit(k);
+  k = IDELEMS(IsAdjustedGB); ideal IsGB = idInit(k);
   for (int i=0; i<k; i++)
-    IsGB->m[i] = p_PermPoly(IsAdjustedGB->m[i],NULL,sAdjusted,s,identity,NULL,0);
+  {
+    if (IsAdjustedGB->m[i]!=NULL)
+    {
+      IsGB->m[i] = p_PermPoly(IsAdjustedGB->m[i],NULL,sAdjusted,s,identity,NULL,0);
+    }
+  }
   id_Delete(&IsAdjustedGB,sAdjusted);
   rDelete(sAdjusted);

Singular/dyn_modules/gfanlib/groebnerComplex.cc

@@ -31 +31 @@
         number p = (number) v->Data();
         tropicalStrategy currentStrategy(I,p,currRing);
-        if (idSize(I)==1)
+        if ((I->m[0]!=NULL) && (idElem(I)==1))
         {
           try

Singular/dyn_modules/gfanlib/groebnerCone.cc

@@ -143 +143 @@
   gfan::ZVector tailexpw = gfan::ZVector(n);
   gfan::ZMatrix inequalities = gfan::ZMatrix(0,n);
-  for (int i=0; i<idSize(polynomialIdeal); i++)
+  for (int i=0; i<IDELEMS(polynomialIdeal); i++)
   {
     g = polynomialIdeal->m[i];
@@ -193 +193 @@
   gfan::ZMatrix equations = gfan::ZMatrix(0,n);
   int* expv = (int*) omAlloc((n+1)*sizeof(int));
-  for (int i=0; i<idSize(polynomialIdeal); i++)
+  for (int i=0; i<IDELEMS(polynomialIdeal); i++)
   {
     poly g = polynomialIdeal->m[i];
@@ -251 +251 @@
   gfan::ZMatrix equations = gfan::ZMatrix(0,n);
   int* expv = (int*) omAlloc((n+1)*sizeof(int));
-  for (int i=0; i<idSize(polynomialIdeal); i++)
+  for (int i=0; i<IDELEMS(polynomialIdeal); i++)
   {
     poly g = polynomialIdeal->m[i];
@@ -303 +303 @@
   gfan::ZMatrix equations = gfan::ZMatrix(0,n);
   int* expv = (int*) omAlloc((n+1)*sizeof(int));
-  for (int i=0; i<idSize(inI); i++)
+  for (int i=0; i<IDELEMS(inI); i++)
   {
     poly g = inI->m[i];
@@ -319 +319 @@
   }
   gfan::ZMatrix inequalities = gfan::ZMatrix(0,n);
-  for (int i=0; i<idSize(polynomialIdeal); i++)
+  for (int i=0; i<IDELEMS(polynomialIdeal); i++)
   {
     poly g = polynomialIdeal->m[i];

Singular/dyn_modules/gfanlib/groebnerFan.cc

@@ -93 +93 @@
     if (v==NULL)
     {
-      if (idSize(I)==1)
+      if ((I->m[0]!=NULL) && (idElem(I)==1))
       {
         try

Singular/dyn_modules/gfanlib/initial.cc

@@ -60 +60 @@
 ideal initial(const ideal I, const ring r, const gfan::ZVector w)
 {
-  int k = idSize(I); ideal inI = idInit(k);
+  int k = IDELEMS(I); ideal inI = idInit(k);
   for (int i=0; i<k; i++)
     inI->m[i] = initial(I->m[i],r,w);
@@ -96 +96 @@
 ideal initial(const ideal I, const ring r, const gfan::ZVector w, const gfan::ZMatrix W)
 {
-  int k = idSize(I); ideal inI = idInit(k);
+  int k = IDELEMS(I); ideal inI = idInit(k);
   for (int i=0; i<k; i++)
     inI->m[i] = initial(I->m[i],r,w,W);
@@ -144 +144 @@
 {
   ideal I = *IStar;
-  int k = idSize(I);
+  int k = IDELEMS(I);
   for (int i=0; i<k; i++)
     initial(&I->m[i],r,w);
@@ -192 +192 @@
 {
   ideal I = *IStar;
-  int k = idSize(I);
+  int k = IDELEMS(I);
   for (int i=0; i<k; i++)
     initial(&I->m[i],r,w,W);

Singular/dyn_modules/gfanlib/lift.cc

@@ -12 +12 @@
 // {
 //   nMapFunc identity = n_SetMap(r->cf,s->cf);
-//   int k = idSize(I); ideal Is = idInit(k);
+//   int k = IDELEMS(I); ideal Is = idInit(k);
 //   for (int i=0; i<k; i++)
 //     Is->m[i] = p_PermPoly(I->m[i],NULL,r,s,identity,NULL,0);
@@ -25 +25 @@
 {
   nMapFunc identity = n_SetMap(s->cf,r->cf);
-  int k = idSize(inI); ideal inIr = idInit(k);
+  int k = IDELEMS(inI); ideal inIr = idInit(k);
   for (int i=0; i<k; i++)
-    inIr->m[i] = p_PermPoly(inI->m[i],NULL,s,r,identity,NULL,0);
+  {
+    if(inI->m[i]!=NULL)
+    {
+      inIr->m[i] = p_PermPoly(inI->m[i],NULL,s,r,identity,NULL,0);
+    }
+  }
   ideal Ir = witness(inIr,J,r);
 
@@ -33 +38 @@
   ideal Is = idInit(k);
   for (int i=0; i<k; i++)
-    Is->m[i] = p_PermPoly(Ir->m[i],NULL,r,s,identity,NULL,0);
+  {
+    if(Ir->m[i]!=NULL)
+    {
+      Is->m[i] = p_PermPoly(Ir->m[i],NULL,r,s,identity,NULL,0);
+    }
+  }
 
   id_Delete(&inIr,r);

Singular/dyn_modules/gfanlib/ppinitialReduction.cc

@@ -245 +245 @@
 void ptNormalize(ideal I, const number p, const ring r)
 {
-  for (int i=0; i<idSize(I); i++)
+  for (int i=0; i<IDELEMS(I); i++)
     ptNormalize(&(I->m[i]),p,r);
   return;
@@ -301 +301 @@
 void pReduce(ideal &I, const number p, const ring r)
 {
-  int k = idSize(I);
+  int k = IDELEMS(I);
   for (int i=0; i<k; i++)
   {
@@ -311 +311 @@
     }
   }
-  return;
 }
 
@@ -395 +394 @@
 bool ppreduceInitially(ideal I, const number p, const ring r)
 {
-  int m=idSize(I),n=m; poly cache;
+  idSkipZeroes(I);
+  int m=IDELEMS(I),n=m; poly cache;
   do
   {
@@ -401 +401 @@
     for (int i=1; i<n; i++)
     {
-      if (p_LmCmp(I->m[i-1],I->m[i],r)<0)
+      if (p_LmCmp(I->m[i-1],I->m[i],r)<0) /*p_LmCmp(p,q): requires: p,q!=NULL*/
       {
         cache=I->m[i-1];
@@ -481 +481 @@
   p_Test(g,r);
   idInsertPoly(I,g);
-  int n=idSize(I);
+  idSkipZeroes(I);
+  int n=IDELEMS(I);
   int j;
   for (j=n-1; j>0; j--)
   {
-    if (p_LmCmp(I->m[j], I->m[j-1],r)>0)
+    if (p_LmCmp(I->m[j], I->m[j-1],r)>0) /*p_LmCmp(p,q) requires: p,q!=NULL */
     {
       poly cache = I->m[j];
@@ -666 +667 @@
    *   T is sorted by the ordering on the temrs the pairs correspond to.
    **/
-  int m=idSize(H);
+  int m=IDELEMS(H);
   ideal I = idInit(m);
   std::vector<mark> T;
   for (int i=0; i<m; i++)
   {
-    I->m[i]=H->m[i];
-    if (pNext(I->m[i])!=NULL)
-      T.push_back(std::pair<int,int>(i,1));
+    if(H->m[i]!=NULL)
+    {
+      I->m[i]=H->m[i];
+      if (pNext(I->m[i])!=NULL)
+        T.push_back(std::pair<int,int>(i,1));
+    }
   }
 
@@ -680 +684 @@
    *   by adding suitable elements to I and reducing it initially with respect to itself
    **/
-  int k=idSize(G);
+  int k=IDELEMS(G);
   while (T.size()>0)
   {
     sortMarks(I,r,T);
-    int i=0; for (; i<k; i++)
-      if (p_LeadmonomDivisibleBy(G->m[i],getTerm(I,T[0]),r)) break;
+    int i=0;
+    for (; i<k; i++)
+    {
+      if(G->m[i]!=NULL)
+      {
+        if (p_LeadmonomDivisibleBy(G->m[i],getTerm(I,T[0]),r)) break;
+      }
+    }
     if (i<k)
     {
@@ -705 +715 @@
    * Step 4: cleanup, delete all polynomials in I which have been added in Step 3
    **/
-  k=idSize(I);
+  k=IDELEMS(I);
   for (int i=0; i<k; i++)
   {
-    for (int j=0; j<m; j++)
-    {
-      if (p_LeadmonomDivisibleBy(H->m[j],I->m[i],r))
-      {
-        I->m[i]=NULL;
-        break;
+    if(I->m[i]!=NULL)
+    {
+      for (int j=0; j<m; j++)
+      {
+        if ((H->m[j]!=NULL)
+        && (p_LeadmonomDivisibleBy(H->m[j],I->m[i],r)))
+        {
+          I->m[i]=NULL;
+          break;
+        }
       }
     }
@@ -765 +779 @@
    *  the lowest component should only contain p-t
    **/
-  std::map<long,ideal> H; int n = idSize(I);
+  std::map<long,ideal> H; int n = IDELEMS(I);
   for (int i=0; i<n; i++)
   {
-    I->m[i] = p_Cleardenom(I->m[i],r);
-    long d = 0;
-    for (int j=2; j<=r->N; j++)
-      d += p_GetExp(I->m[i],j,r);
-    std::map<long,ideal>::iterator it = H.find(d);
-    if (it != H.end())
-      idInsertPoly(it->second,I->m[i]);
-    else
-    {
-      std::pair<long,ideal> Hd(d,idInit(1));
-      Hd.second->m[0] = I->m[i];
-      H.insert(Hd);
+    if(I->m[i]!=NULL)
+    {
+      I->m[i] = p_Cleardenom(I->m[i],r);
+      long d = 0;
+      for (int j=2; j<=r->N; j++)
+        d += p_GetExp(I->m[i],j,r);
+      std::map<long,ideal>::iterator it = H.find(d);
+      if (it != H.end())
+        idInsertPoly(it->second,I->m[i]);
+      else
+      {
+        std::pair<long,ideal> Hd(d,idInit(1));
+        Hd.second->m[0] = I->m[i];
+        H.insert(Hd);
+      }
     }
   }
@@ -794 +811 @@
    **/
   if (ppreduceInitially(Hi,p,r)) return true;
+  idSkipZeroes(Hi);
   id_Test(Hi,r);
   id_Test(I,r);
@@ -803 +821 @@
   for (it++; it!=H.end(); it++)
   {
-    int l=idSize(Hi); int k=l; poly cache;
+    int l=IDELEMS(Hi); int k=l; poly cache;
     /**
      * sorts Hi according to degree in t in descending order

Singular/dyn_modules/gfanlib/startingCone.cc

@@ -119 +119 @@
   {
     ideal I = (ideal) u->Data();
-    if (idSize(I)==1)
+    if ((I->m[0]!=NULL) && (idElem(I)==1))
     {
       tropicalStrategy currentStrategy(I,currRing);
@@ -154 +154 @@
   {
     ideal I = (ideal) u->Data();
-    if (idSize(I)==1)
+    if ((I->m[0]!=NULL) && (idElem(I)==1))
     {
       tropicalStrategy currentStrategy(I,currRing);
@@ -189 +189 @@
   {
     ideal I = (ideal) u->Data();
-    if (idSize(I)==1)
+    if ((I->m[0]!=NULL) && (idElem(I)==1))
     {
       tropicalStrategy currentStrategy(I,currRing);
@@ -225 +225 @@
   {
     ideal I = (ideal) u->Data();
-    if (idSize(I)==1)
+    if ((I->m[0]!=NULL) && (idElem(I)==1))
     {
       tropicalStrategy currentStrategy(I,currRing);
@@ -262 +262 @@
     ideal I = (ideal) u->Data();
     tropicalStrategy currentStrategy(I,currRing);
-    if (idSize(I)==1)
+    if ((I->m[0]!=NULL) && (idElem(I)==1))
     {
       poly g = I->m[0];
@@ -311 +311 @@
   gfan::ZMatrix equations = gfan::ZMatrix(0,n);
   int* expv = (int*) omAlloc((n+1)*sizeof(int));
-  int k = idSize(I);
+  int k = IDELEMS(I);
   for (int i=0; i<k; i++)
   {
@@ -344 +344 @@
     // inI <- I
     ring s = rCopy(r);
-    int k = idSize(I); ideal inI = idInit(k);
+    int k = IDELEMS(I); ideal inI = idInit(k);
     nMapFunc identityMap = n_SetMap(r->cf,s->cf);
     for (int i=0; i<k; i++)
-      inI->m[i] = p_PermPoly(I->m[i],NULL,r,s,identityMap,NULL,0);
+    {
+      if(I->m[i]!=NULL)
+      {
+        inI->m[i] = p_PermPoly(I->m[i],NULL,r,s,identityMap,NULL,0);
+      }
+    }
 
     // repeatedly computes a point in the tropical variety outside the lineality space,
@@ -408 +413 @@
     // inJ <- I
     ring s = rCopy(r);
-    int k = idSize(I); ideal inJ = idInit(k);
+    int k = IDELEMS(I); ideal inJ = idInit(k);
     nMapFunc identityMap = n_SetMap(r->cf,s->cf);
     for (int i=0; i<k; i++)
-      inJ->m[i] = p_PermPoly(I->m[i],NULL,r,s,identityMap,NULL,0);
+    {
+      if(I->m[i]!=NULL)
+      {
+        inJ->m[i] = p_PermPoly(I->m[i],NULL,r,s,identityMap,NULL,0);
+      }
+    }
 
     // and check whether the dimension of its homogeneity space
@@ -464 +474 @@
     rComplete(rShortcut);
     rTest(rShortcut);
-    k = idSize(inJ);
+    k = IDELEMS(inJ);
     ideal inJShortcut = idInit(k);
     nMapFunc takingResidues = n_SetMap(s->cf,rShortcut->cf);
     for (int i=0; i<k; i++)
-      inJShortcut->m[i] = p_PermPoly(inJ->m[i],NULL,s,rShortcut,takingResidues,NULL,0);
+    {
+      if(inJ->m[i]!=NULL)
+      {
+        inJShortcut->m[i] = p_PermPoly(inJ->m[i],NULL,s,rShortcut,takingResidues,NULL,0);
+      }
+    }
     idSkipZeroes(inJShortcut);
     id_Delete(&inJ,s);
@@ -496 +511 @@
     rTest(s);
 
-    k = idSize(inJShortcut); // inJ will be overwritten with initial of inJ
+    k = IDELEMS(inJShortcut); // inJ will be overwritten with initial of inJ
     inJ = idInit(k+1);
     inJ->m[0] = p_One(s);    // with respect to that weight
@@ -503 +518 @@
     nMapFunc findingRepresentatives = n_SetMap(sShortcut->cf,s->cf);
     for (int i=0; i<k; i++)              // and then come the rest
-      inJ->m[i+1] = p_PermPoly(inJShortcut->m[i],NULL,sShortcut,s,findingRepresentatives,NULL,0);
+    {
+      if(inJShortcut->m[i]!=NULL)
+      {
+        inJ->m[i+1] = p_PermPoly(inJShortcut->m[i],NULL,sShortcut,s,findingRepresentatives,NULL,0);
+      }
+    }
 
     ideal J = currentStrategy.computeLift(inJ,s,inI,I,r);

Singular/dyn_modules/gfanlib/tropical.cc

@@ -164 +164 @@
 
   gfan::ZMatrix inequalities = gfan::ZMatrix(0,n);
-  for (int i=0; i<idSize(I); i++)
+  for (int i=0; i<IDELEMS(I); i++)
   {
     g = (poly) I->m[i];
@@ -184 +184 @@
   ideal inI = initial(I,currRing,w);
   gfan::ZMatrix equations = gfan::ZMatrix(0,n);
-  for (int i=0; i<idSize(I); i++)
+  for (int i=0; i<IDELEMS(I); i++)
   {
     g = (poly) inI->m[i];

Singular/dyn_modules/gfanlib/tropicalCurves.cc

@@ -117 +117 @@
                                      const tropicalStrategy* currentStrategy)
 {
-  int k = idSize(inI);
+  int k = IDELEMS(inI);
   int d = currentStrategy->getExpectedDimension();
 
@@ -124 +124 @@
   ZConesSortedByDimension C = tropicalVarietySortedByDimension(inI->m[0],r,currentStrategy);
   for (int i=1; i<k; i++)
-    C = intersect(C,tropicalVarietySortedByDimension(inI->m[i],r,currentStrategy),d);
+  {
+    if(inI->m[i]!=NULL)
+    {
+      C = intersect(C,tropicalVarietySortedByDimension(inI->m[i],r,currentStrategy),d);
+    }
+  }
 
   /* Cycle through all maximal cones of the refinement.

Singular/dyn_modules/gfanlib/tropicalStrategy.cc

@@ -48 +48 @@
 static void swapElements(ideal I, ideal J)
 {
-  assume(idSize(I)==idSize(J));
-
-  for (int i=idSize(I)-1; i>=0; i--)
+  assume(IDELEMS(I)==IDELEMS(J));
+
+  for (int i=IDELEMS(I)-1; i>=0; i--)
   {
     poly cache = I->m[i];
@@ -97 +97 @@
   omFree(wvhdl);
 
-  int k = idSize(I);
+  int k = IDELEMS(I);
   ideal IShortcut = idInit(k);
   nMapFunc intoShortcut = n_SetMap(r->cf,rShortcut->cf);
   for (int i=0; i<k; i++)
-    IShortcut->m[i] = p_PermPoly(I->m[i],NULL,r,rShortcut,intoShortcut,NULL,0);
+  {
+    if(I->m[i]!=NULL)
+    {
+      IShortcut->m[i] = p_PermPoly(I->m[i],NULL,r,rShortcut,intoShortcut,NULL,0);
+    }
+  }
 
   ideal JShortcut = gfanlib_kStd_wrapper(IShortcut,rShortcut);
@@ -226 +231 @@
 
   // map originalIdeal from originalRing into startingRing
-  int k = idSize(originalIdeal);
+  int k = IDELEMS(originalIdeal);
   ideal J = idInit(k+1);
   nMapFunc nMap = n_SetMap(originalRing->cf,startingRing->cf);
@@ -234 +239 @@
     shiftByOne[i]=i+1;
   for (int i=0; i<k; i++)
-    J->m[i] = p_PermPoly(originalIdeal->m[i],shiftByOne,originalRing,startingRing,nMap,NULL,0);
+  {
+    if(originalIdeal->m[i]!=NULL)
+    {
+      J->m[i] = p_PermPoly(originalIdeal->m[i],shiftByOne,originalRing,startingRing,nMap,NULL,0);
+    }
+  }
   omFreeSize(shiftByOne,(n+1)*sizeof(int));
 
@@ -375 +385 @@
   poly pt = p_Add_q(p,p_Neg(t,r),r);
 
-  int k = idSize(I);
+  int k = IDELEMS(I);
   int l;
   for (l=0; l<k; l++)
@@ -476 +486 @@
 {
   // quick check whether I already contains an ideal
-  int k = idSize(I);
+  int k = IDELEMS(I);
   for (int i=0; i<k; i++)
   {
     poly g = I->m[i];
-    if (pNext(g)==NULL && (isValuationTrivial() || n_IsOne(p_GetCoeff(g,r),r->cf)))
+    if (g!=NULL
+    && pNext(g)==NULL
+    && (isValuationTrivial() || n_IsOne(p_GetCoeff(g,r),r->cf)))
       return std::pair<poly,int>(g,i);
   }
@@ -553 +565 @@
   else
   {
-    assume(idSize(inI)==idSize(I));
+    assume(IDELEMS(inI)==IDELEMS(I));
     int uni = findPositionOfUniformizingBinomial(I,r);
     assume(uni>=0);
@@ -562 +574 @@
     ring rShortcut = copyAndChangeCoefficientRing(r);
 
-    int k = idSize(inJ);
-    int l = idSize(I);
+    int k = IDELEMS(inJ);
+    int l = IDELEMS(I);
     ideal inJShortcut = idInit(k);
     ideal inIShortcut = idInit(l);
@@ -634 +646 @@
   ring rShortcut = copyAndChangeCoefficientRing(r);
   nMapFunc takingResidues = n_SetMap(r->cf,rShortcut->cf);
-  int k = idSize(inI);
+  int k = IDELEMS(inI);
   ideal inIShortcut = idInit(k);
   for (int i=0; i<k; i++)
@@ -642 +654 @@
   // and lift the result back to the ring with valuation
   nMapFunc takingRepresentatives = n_SetMap(rShortcut->cf,r->cf);
-  k = idSize(inJShortcut);
+  k = IDELEMS(inJShortcut);
   ideal inJ = idInit(k+1);
   inJ->m[0] = p_One(r);
@@ -658 +670 @@
 ideal tropicalStrategy::computeLift(const ideal inJs, const ring s, const ideal inIr, const ideal Ir, const ring r) const
 {
-  int k = idSize(inJs);
+  int k = IDELEMS(inJs);
   ideal inJr = idInit(k);
   nMapFunc identitysr = n_SetMap(s->cf,r->cf);
@@ -765 +777 @@
   ring sAdjusted = copyAndChangeOrderingWP(r,interiorPoint,facetNormal);
   nMapFunc identity = n_SetMap(r->cf,sAdjusted->cf);
-  int k = idSize(Ir);
+  int k = IDELEMS(Ir);
   ideal inIsAdjusted = idInit(k);
   for (int i=0; i<k; i++)
@@ -773 +785 @@
   // find witnesses of the new standard basis elements of the initial ideal
   // with the help of the old standard basis of the ideal
-  k = idSize(inJsAdjusted);
+  k = IDELEMS(inJsAdjusted);
   ideal inJr = idInit(k);
   identity = n_SetMap(sAdjusted->cf,r->cf);
@@ -816 +828 @@
   poly pt = p_Add_q(p,p_Neg(t,r),r);
 
-  for (int i=0; i<idSize(I); i++)
+  for (int i=0; i<IDELEMS(I); i++)
   {
     if (p_EqualPolys(I->m[i],pt,r))
@@ -841 +853 @@
   poly pt = p_Add_q(p,p_Neg(t,r),r);
 
-  for (int i=0; i<idSize(I); i++)
+  for (int i=0; i<IDELEMS(I); i++)
   {
     if (p_EqualPolys(I->m[i],pt,r))
@@ -867 +879 @@
   p_SetCoeff(p,identity(uniformizingParameter,startingRing->cf,r->cf),r);
 
-  for (int i=0; i<idSize(inI); i++)
+  for (int i=0; i<IDELEMS(inI); i++)
   {
     if (p_EqualPolys(inI->m[i],p,r))

Singular/dyn_modules/gfanlib/tropicalStrategy.h

@@ -5 +5 @@
 #include <gfanlib/gfanlib_zcone.h>
 #include <polys/simpleideals.h>
-#include <kernel/ideals.h> // for idSize
+#include <kernel/ideals.h> // for idElem
 #include <set>
 #include <callgfanlib_conversion.h>

Singular/dyn_modules/gfanlib/tropicalVariety.cc

@@ -100 +100 @@
     leftv v = u->next;
 
-    if (idSize(I)==1)
+    if ((I->m[0]!=NULL) && (idElem(I)==1))
     {
       poly g = I->m[0];

Singular/dyn_modules/gfanlib/witness.cc

@@ -34 +34 @@
 poly witness(const poly m, const ideal I, const ideal inI, const ring r)
 {
-  assume(idSize(I)==idSize(inI));
+  assume(IDELEMS(I)==IDELEMS(inI));
   matrix Q = divisionDiscardingRemainder(m,inI,r);
 
-  int k = idSize(I);
+  int k = IDELEMS(I);
   poly f = p_Mult_q(p_Copy(I->m[0],r),Q->m[0],r);
   Q->m[0] = NULL;
@@ -59 +59 @@
     rChangeCurrRing(origin);
 
-  int k = idSize(inI);
+  int k = IDELEMS(inI);
   ideal I = idInit(k);
   for (int i=0; i<k; i++)

Singular/dyn_modules/syzextra/mod_main.cc

@@ -401 +401 @@
   { \
     /* const ring rrr = (iLevel > 0) ? save : save; */ \
-    Print("id '%10s'[%d]: (%p) ncols = %d / size: %d; nrows = %d, rank = %ld / rk: %ld", #v, iLevel, reinterpret_cast<const void*>(((s)->v)[iLevel]), ((s)->v)[iLevel]->ncols, idSize(((s)->v)[iLevel]), ((s)->v)[iLevel]->nrows, ((s)->v)[iLevel]->rank, -1L/*id_RankFreeModule(((s)->v)[iLevel], rrr)*/ ); \
+    Print("id '%10s'[%d]: (%p) ncols = %d / size: %d; nrows = %d, rank = %ld / rk: %ld", #v, iLevel, reinterpret_cast<const void*>(((s)->v)[iLevel]), ((s)->v)[iLevel]->ncols, IDELEMS(((s)->v)[iLevel]), ((s)->v)[iLevel]->nrows, ((s)->v)[iLevel]->rank, -1L/*id_RankFreeModule(((s)->v)[iLevel], rrr)*/ ); \
     PrintLn(); \
   } \

Singular/iparith.cc

@@ -4080 +4080 @@
     //Anne's Idea for std(4,2x) = 0 bug
     long dcurr = d;
-    for(i=0;i<idSize(vv);i++)
+    for(i=0;i<IDELEMS(vv);i++)
     {
       if(vv->m[i] != NULL && !n_IsUnit(pGetCoeff(vv->m[i]),currRing->cf))
@@ -4088 +4088 @@
         pSetCoeff0(c,nCopy(pGetCoeff(vv->m[i])));
         idInsertPoly(vc,c);
-        for(j = 0;j<idSize(vc)-1;j++)
+        idSkipZeroes(vc);
+        for(j = 0;j<IDELEMS(vc)-1;j++)
         {
-          if(n_DivBy(pGetCoeff(vc->m[j]),pGetCoeff(c),currRing->cf))
+          if((vc->m[j]!=NULL)
+          && (n_DivBy(pGetCoeff(vc->m[j]),pGetCoeff(c),currRing->cf)))
           {
             pDelete(&vc->m[j]);

kernel/GBEngine/nc.cc

@@ -306 +306 @@
     h2->m[j]=0;
     }
-    // W[1..idElems(I)]
+    // W[1..IDELEMS(I)]
     if (flag >0)
     {

kernel/GBEngine/syz1.cc

@@ -1992 +1992 @@
       while ((k<syzstr->length) && (rr[k]!=NULL))
       {
-        (*resolution)[k+1] = idSize(rr[k]);
+        (*resolution)[k+1] = idElem(rr[k]);
         k++;
       }

kernel/ideals.h

@@ -38 +38 @@
 //int id_PosConstant(ideal id, const ring r)
 #define idPosConstant(I) id_PosConstant(I,currRing)
-
-/// Count the effective size of an ideal
-/// (without the trailing allocated zero-elements)
-/// deprecated! (use IDELEMS)
-static inline int idSize(const ideal id)
-{
-  int j = IDELEMS(id) - 1;
-  poly* mm = id->m;
-  while ((j >= 0) && (mm[j] == NULL)) j--;
-  return (j + 1);
-}
-
 
 //BOOLEAN id_IsConstant(ideal id, const ring r);

libpolys/polys/simpleideals.cc

@@ -210 +210 @@
   assume (F != NULL);
 
-  int i=0,j=IDELEMS(F)-1;
-
-  while(j>=0)
+  int i=0;
+
+  for(int j=IDELEMS(F)-1;j>=0;j--)
   {
     if ((F->m)[j]!=NULL) i++;
-    j--;
   }
   return i;