Changeset 1f637e in git for kernel/ideals.cc

Timestamp:

Jul 19, 2011, 5:11:57 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

1c4e9a5798bda4bc92d0013041b99005a50a7d7c

Parents:

6ed8c424bfe6fd9dc397bfdde3e8acf884469342

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-07-19 17:11:57+02:00

git-committer:

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

Message:

FIX: replaced pVariables by currRing->N...
ADD: added 'void rChangeCurrRing(ring r);' to polys/polys.h
CHG: started changing gr_kstd2.cc and syz*.cc

File:

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

kernel/ideals.cc

@@ -32 +32 @@
 #include <polys/prCopy.h>
 #include <polys/nc/nc.h>
+
 
 #include <kernel/ideals.h>
@@ -149 +150 @@
     l = 1;
     lex = pGetExp(p,l);
-    while ((l < pVariables) && (lex == 0))
+    while ((l < (currRing->N)) && (lex == 0))
     {
       l++;
@@ -193 +194 @@
       pIter(qresult);
     }
-    for (j=pVariables-1; j>0; j--)
+    for (j=(currRing->N)-1; j>0; j--)
     {
       lex = pGetExp(qp,j);
@@ -1615 +1616 @@
   {
     block0[1] = 1;
-    block1[1] = pVariables;
+    block1[1] = (currRing->N);
     if (origR->OrdSgn==1) ord[1] = ringorder_wp;
     else                  ord[1] = ringorder_ws;
-    wv[1]=(int*)omAlloc0(pVariables*sizeof(int));
-    double wNsqr = (double)2.0 / (double)pVariables;
+    wv[1]=(int*)omAlloc0((currRing->N)*sizeof(int));
+    double wNsqr = (double)2.0 / (double)(currRing->N);
     wFunctional = wFunctionalBuch;
-    int  *x= (int * )omAlloc(2 * (pVariables + 1) * sizeof(int));
+    int  *x= (int * )omAlloc(2 * ((currRing->N) + 1) * sizeof(int));
     int sl=IDELEMS(h1) - 1;
     wCall(h1->m, sl, x, wNsqr);
-    for (sl = pVariables; sl!=0; sl--)
-      wv[1][sl-1] = x[sl + pVariables + 1];
-    omFreeSize((ADDRESS)x, 2 * (pVariables + 1) * sizeof(int));
+    for (sl = (currRing->N); sl!=0; sl--)
+      wv[1][sl-1] = x[sl + (currRing->N) + 1];
+    omFreeSize((ADDRESS)x, 2 * ((currRing->N) + 1) * sizeof(int));
 
     ord[2]=ringorder_C;
@@ -1735 +1736 @@
 #endif
   // change into the new ring
-  //pChangeRing(pVariables,currRing->OrdSgn,ord,block0,block1,wv);
+  //pChangeRing((currRing->N),currRing->OrdSgn,ord,block0,block1,wv);
   rChangeCurrRing(tmpR);
 
@@ -1774 +1775 @@
   for (k=0; k<=i; k++)
   {
-    l=pVariables;
+    l=(currRing->N);
     while ((l>0) && (p_GetExp( hh->m[k],l,tmpR)*pGetExp(delVar,l)==0)) l--;
     if (l==0)
@@ -2374 +2375 @@
   while ((j>0) && (kbase->m[j-1]==NULL)) j--;
   if (j==0) return -1;
-  int i=pVariables;
+  int i=(currRing->N);
   while (i>0)
   {
@@ -2409 +2410 @@
   poly coeff=pOne(), base=pOne();
 
-  for (i=1;i<=pVariables;i++)
+  for (i=1;i<=(currRing->N);i++)
   {
     if (pGetExp(how,i)>0)