Changeset e5739a in git

Timestamp:

Aug 10, 2011, 3:23:07 PM (13 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3705cd9bb524607a0a68e71450ae458b8cb98e69

Parents:

cffea8fb2ce6cb469ccc7bfd37d9ad5452f1c67a

git-author:

Burcin Erocal <burcin@erocal.org>2011-08-10 15:23:07+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:17:27+01:00

Message:

Change pVariables in Singular/pcv.cc with currRing->N.

File:

• Singular/pcv.cc (modified) (9 diffs)

Singular/pcv.cc

@@ -107 +107 @@
 {
   int d=0;
-  for(int i=pVariables;i>=1;i--) d+=pGetExp(p,i);
+  for(int i=currRing->N;i>=1;i--) d+=pGetExp(p,i);
   return d;
 }
@@ -166 +166 @@
   if(d<0) d=1;
   pcvMaxDegree=d+1;
-  pcvTableSize=pVariables*pcvMaxDegree*sizeof(unsigned);
+  pcvTableSize=currRing->N*pcvMaxDegree*sizeof(unsigned);
   pcvTable=(unsigned*)omAlloc0(pcvTableSize);
-  pcvIndexSize=pVariables*sizeof(unsigned*);
+  pcvIndexSize=currRing->N*sizeof(unsigned*);
   pcvIndex=(unsigned**)omAlloc(pcvIndexSize);
-  for(int i=0;i<pVariables;i++)
+  for(int i=0;i<currRing->N;i++)
     pcvIndex[i]=pcvTable+i*pcvMaxDegree;
   for(int i=0;i<pcvMaxDegree;i++)
     pcvIndex[0][i]=i;
   unsigned k,l;
-  for(int i=1;i<pVariables;i++)
+  for(int i=1;i<currRing->N;i++)
   {
     k=0;
@@ -184 +184 @@
       {
         j=pcvMaxDegree;
-        i=pVariables;
+        i=currRing->N;
         WerrorS("unsigned overflow");
       }
@@ -209 +209 @@
 {
   unsigned n=0,dn,d=0;
-  for(int i=0;i<pVariables;i++)
+  for(int i=0;i<currRing->N;i++)
   {
     d+=pGetExp(m,i+1);
@@ -215 +215 @@
     if(dn>INT_MAX-n)
     {
-      i=pVariables;
+      i=currRing->N;
       WerrorS("component overflow");
     }
@@ -228 +228 @@
   poly m=pOne();
   int i,j=0,k;
-  for(i=pVariables-1;i>=0;i--)
+  for(i=currRing->N-1;i>=0;i--)
   {
     k=j;
@@ -234 +234 @@
     j--;
     n-=pcvIndex[i][j];
-    if(i<pVariables-1) pSetExp(m,i+2,k-j);
+    if(i<currRing->N-1) pSetExp(m,i+2,k-j);
   }
   if(n==0)
@@ -381 +381 @@
   if(d1<0) d1=0;
   pcvInit(d1);
-  int d=pcvIndex[pVariables-1][d1]-pcvIndex[pVariables-1][d0];
+  int d=pcvIndex[currRing->N-1][d1]-pcvIndex[currRing->N-1][d0];
   pcvClean();
   return d;
@@ -411 +411 @@
 int pcvBasis(lists b,int i,poly m,int d,int n)
 {
-  if(n<pVariables)
+  if(n<currRing->N)
   {
     for(int k=0,l=d;k<=l;k++,d--)