Changeset 7b25fe in git for kernel/ideals.cc

Timestamp:

Jul 25, 2011, 5:40:41 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

1558d57b639351ad0ad10d1e5e337419bfcf21fb

Parents:

630dad1a4f9f6b630b4dcfa05851a5869b7fe25b

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-25 17:40:41+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:53:33+01:00

Message:

fix idRankFreeModule -> id_RankFreeModule

File:

• kernel/ideals.cc (modified) (13 diffs)

kernel/ideals.cc

@@ -285 +285 @@
   assume(!idIs0(h2));
   assume(IDELEMS(h1)<=IDELEMS(h2));
-  assume(idRankFreeModule(h1)==0);
-  assume(idRankFreeModule(h2)==0);
+  assume(id_RankFreeModule(h1,currRing)==0);
+  assume(id_RankFreeModule(h2,currRing)==0);
   // add a new variable:
   int j;
@@ -351 +351 @@
 {
   int i,j,k,length;
-  int flength = idRankFreeModule(h1);
-  int slength = idRankFreeModule(h2);
+  int flength = id_RankFreeModule(h1,currRing);
+  int slength = id_RankFreeModule(h2,currRing);
   int rank=si_min(flength,slength);
   if ((idIs0(h1)) || (idIs0(h2)))  return idInit(1,rank);
@@ -500 +500 @@
     if (!idIs0(arg[i]))
     {
-      realrki=idRankFreeModule(arg[i]);
+      realrki=id_RankFreeModule(arg[i],currRing);
       k++;
       j += IDELEMS(arg[i]);
@@ -610 +610 @@
 
   if (idIs0(h1)) return NULL;
-  k = idRankFreeModule(h1);
+  k = id_RankFreeModule(h1,currRing);
   h2=idCopy(h1);
   i = IDELEMS(h2)-1;
@@ -724 +724 @@
     return result;
   }
-  int slength=(int)idRankFreeModule(h1);
-  k=si_max(1,slength /*idRankFreeModule(h1)*/);
+  int slength=(int)id_RankFreeModule(h1,currRing);
+  k=si_max(1,slength /*id_RankFreeModule(h1)*/);
 
   assume(currRing != NULL);
@@ -893 +893 @@
 ideal idLiftStd (ideal  h1, matrix* ma, tHomog hi, ideal * syz)
 {
-  int   i, j, k, t, inputIsIdeal=idRankFreeModule(h1);
+  int   i, j, k, t, inputIsIdeal=id_RankFreeModule(h1,currRing);
   poly  p=NULL, q, qq;
   intvec *w=NULL;
@@ -919 +919 @@
   BITSET save_verbose=verbose;
 
-  k=si_max(1,(int)idRankFreeModule(h1));
+  k=si_max(1,(int)id_RankFreeModule(h1,currRing));
 
   if ((k==1) && (!lift3)) verbose |=Sy_bit(V_IDLIFT);
@@ -1047 +1047 @@
 static void idPrepareStd(ideal s_temp, int k)
 {
-  int j,rk=idRankFreeModule(s_temp);
+  int j,rk=id_RankFreeModule(s_temp,currRing);
   poly p,q;
 
@@ -1081 +1081 @@
              BOOLEAN isSB, BOOLEAN divide, matrix *unit)
 {
-  int lsmod =idRankFreeModule(submod), i, j, k;
+  int lsmod =id_RankFreeModule(submod,currRing), i, j, k;
   int comps_to_add=0;
   poly p;
@@ -1125 +1125 @@
       comps_to_add--;
   }
-  k=si_max(idRankFreeModule(mod),idRankFreeModule(submod));
+  k=si_max(id_RankFreeModule(mod,currRing),id_RankFreeModule(submod,currRing));
   if  ((k!=0) && (lsmod==0)) lsmod=1;
   k=si_max(k,(int)mod->rank);
@@ -1364 +1364 @@
   int i,l,ll,k,kkk,kmax;
   int j = 0;
-  int k1 = idRankFreeModule(h1);
-  int k2 = idRankFreeModule(h2);
+  int k1 = id_RankFreeModule(h1,currRing);
+  int k2 = id_RankFreeModule(h2,currRing);
   tHomog   hom=isNotHomog;
 
@@ -2198 +2198 @@
     return idFreeModule(si_max(1,h2->ncols));
   if (!idIs0(h1))
-    flength = idRankFreeModule(h1);
-  slength = idRankFreeModule(h2);
+    flength = id_RankFreeModule(h1,currRing);
+  slength = id_RankFreeModule(h2,currRing);
   length  = si_max(flength,slength);
   if (length==0)
@@ -2509 +2509 @@
   ideal res=arg;
   if (!inPlace) res = idCopy(arg);
-  res->rank=si_max(res->rank,idRankFreeModule(res));
+  res->rank=si_max(res->rank,id_RankFreeModule(res,currRing));
   int *red_comp=(int*)omAlloc((res->rank+1)*sizeof(int));
   for (i=res->rank;i>=0;i--) red_comp[i]=i;