Changeset 7fccc79 in git

Timestamp:

Aug 12, 2011, 2:11:46 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

1f414c83d736799f4aa2169403778da7b6403897

Parents:

8a5c493dd06549f9120fe7fda0d889a440420073

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-12 14:11:46+02:00

git-committer:

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

Message:

fix pVariables ->rVar(currRing)

File:

• Singular/ipshell.cc (modified) (26 diffs)

Singular/ipshell.cc

@@ -996 +996 @@
   if (hNexist == 0)
   {
-    intvec *iv=new intvec(pVariables);
-    for(i=0; i<pVariables; i++) (*iv)[i]=1;
+    intvec *iv=new intvec(rVar(currRing));
+    for(i=0; i<rVar(currRing); i++) (*iv)[i]=1;
     res->Init(1);
     res->m[0].rtyp=INTVEC_CMD;
@@ -1011 +1011 @@
   hMu = 0;
   hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
-  hvar = (varset)omAlloc((pVariables + 1) * sizeof(int));
-  hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(long));
+  hvar = (varset)omAlloc((rVar(currRing) + 1) * sizeof(int));
+  hpure = (scmon)omAlloc((1 + (rVar(currRing) * rVar(currRing))) * sizeof(long));
   hrad = hexist;
   hNrad = hNexist;
-  radmem = hCreate(pVariables - 1);
-  hCo = pVariables + 1;
-  hNvar = pVariables;
+  radmem = hCreate(rVar(currRing) - 1);
+  hCo = rVar(currRing) + 1;
+  hNvar = rVar(currRing);
   hRadical(hrad, &hNrad, hNvar);
   hSupp(hrad, hNrad, hvar, &hNvar);
@@ -1023 +1023 @@
   {
     hCo = hNvar;
-    memset(hpure, 0, (pVariables + 1) * sizeof(long));
+    memset(hpure, 0, (rVar(currRing) + 1) * sizeof(long));
     hPure(hrad, 0, &hNrad, hvar, hNvar, hpure, &hNpure);
     hLexR(hrad, hNrad, hvar, hNvar);
     hDimSolve(hpure, hNpure, hrad, hNrad, hvar, hNvar);
   }
-  if (hCo && (hCo < pVariables))
+  if (hCo && (hCo < rVar(currRing)))
   {
     hIndMult(hpure, hNpure, hrad, hNrad, hvar, hNvar);
@@ -1036 +1036 @@
     ISet = save;
     hMu2 = 0;
-    if (all && (hCo+1 < pVariables))
+    if (all && (hCo+1 < rVar(currRing)))
     {
       JSet = (indset)omAlloc0Bin(indlist_bin);
@@ -1079 +1079 @@
     omFreeBin((ADDRESS)ISet,  indlist_bin);
   }
-  hKill(radmem, pVariables - 1);
-  omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(long));
-  omFreeSize((ADDRESS)hvar, (pVariables + 1) * sizeof(int));
+  hKill(radmem, rVar(currRing) - 1);
+  omFreeSize((ADDRESS)hpure, (1 + (rVar(currRing) * rVar(currRing))) * sizeof(long));
+  omFreeSize((ADDRESS)hvar, (rVar(currRing) + 1) * sizeof(int));
   omFreeSize((ADDRESS)hwork, hNexist * sizeof(scmon));
   hDelete(hexist, hNexist);
@@ -1461 +1461 @@
     {
       pGetCoeff(po)=nInit(1);
-      for (i=pVariables; i>0; i--)
+      for (i=rVar(currRing); i>0; i--)
       {
         if (pGetExp(po, i) > 0) pDecrExp(po,i);
@@ -2433 +2433 @@
         else if (par_perm_size!=0)
           for(i=si_min(rPar(orig_ring),rPar(currRing))-1;i>=0;i--) par_perm[i]=-(i+1);
-        for(i=si_min(orig_ring->N,pVariables);i>0;i--) perm[i]=i;
+        for(i=si_min(orig_ring->N,rVar(currRing));i>0;i--) perm[i]=i;
         #endif
         ideal dest_id=idInit(IDELEMS(q),1);
@@ -2508 +2508 @@
   ideal id=(ideal)a->Data();
 
-  result =mpNew(IDELEMS(id),pVariables);
+  result =mpNew(IDELEMS(id),rVar(currRing));
   for (i=1; i<=IDELEMS(id); i++)
   {
-    for (j=1; j<=pVariables; j++)
+    for (j=1; j<=rVar(currRing); j++)
     {
       MATELEM(result,i,j) = pDiff(id->m[i-1],j);
@@ -2739 +2739 @@
 {
   ideal F=(ideal)id->Data();
-  intvec * iv = new intvec(pVariables);
+  intvec * iv = new intvec(rVar(currRing));
   polyset s;
   int  sl, n, i;
@@ -2747 +2747 @@
   s = F->m;
   sl = IDELEMS(F) - 1;
-  n = pVariables;
+  n = rVar(currRing);
   double wNsqr = (double)2.0 / (double)n;
   wFunctional = wFunctionalBuch;
@@ -2762 +2762 @@
   res->data=(char *)idQHomWeight((ideal)v->Data());
   if (res->data==NULL)
-    res->data=(char *)new intvec(pVariables);
+    res->data=(char *)new intvec(rVar(currRing));
   return FALSE;
 }
@@ -3055 +3055 @@
 
   ideal J = NULL;
-  J = idInit( pVariables,1 );
+  J = idInit( rVar(currRing),1 );
 
   #ifdef SPECTRUM_DEBUG
@@ -3067 +3067 @@
   #endif
 
-  for( i=0; i<pVariables; i++ )
+  for( i=0; i<rVar(currRing); i++ )
   {
     J->m[i] = pDiff( h,i+1); //j );
@@ -3142 +3142 @@
   // ------------------------------------------
 
-  for( i=pVariables; i>0; i-- )
+  for( i=rVar(currRing); i>0; i-- )
   {
     if( hasAxis( stdJ,i )==FALSE )
@@ -3172 +3172 @@
     pGetCoeff(hc) = nInit(1);
 
-    for( i=pVariables; i>0; i-- )
+    for( i=rVar(currRing); i>0; i-- )
     {
       if( pGetExp( hc,i )>0 ) pDecrExp( hc,i );
@@ -3231 +3231 @@
 
   poly    wc = ( fast==0 ? pCopy( hc ) :
-               ( fast==1 ? computeWC( nph,(Rational)pVariables ) :
-              /* fast==2 */computeWC( nph,((Rational)pVariables)/(Rational)2 ) ) );
+               ( fast==1 ? computeWC( nph,(Rational)rVar(currRing) ) :
+              /* fast==2 */computeWC( nph,((Rational)rVar(currRing))/(Rational)2 ) ) );
 
   #ifdef SPECTRUM_DEBUG
@@ -3552 +3552 @@
     for( i=0, j=n-1; i<=j; i++,j-- )
     {
-        if( (*num)[i] != pVariables*((*den)[i]) - (*num)[j] ||
+        if( (*num)[i] != rVar(currRing)*((*den)[i]) - (*num)[j] ||
             (*den)[i] != (*den)[j] ||
             (*mul)[i] != (*mul)[j] )
@@ -3760 +3760 @@
     int               found,cmp;
 
-    Rational smax( ( fast==0 ? 0 : pVariables ),
+    Rational smax( ( fast==0 ? 0 : rVar(currRing) ),
                    ( fast==2 ? 2 : 1 ) );
 
@@ -3934 +3934 @@
         for( n1=0, n2=n-1; n1<n2; n1++, n2-- )
         {
-            (*nom) [n2] = pVariables*(*den)[n1]-(*nom)[n1];
+            (*nom) [n2] = rVar(currRing)*(*den)[n1]-(*nom)[n1];
             (*den) [n2] = (*den)[n1];
             (*mult)[n2] = (*mult)[n1];
@@ -3952 +3952 @@
             if( (*mult)[n1]!=(*mult)[n2] ||
                 (*den) [n1]!= (*den)[n2] ||
-                (*nom)[n1]+(*nom)[n2]!=pVariables*(*den) [n1] )
+                (*nom)[n1]+(*nom)[n2]!=rVar(currRing)*(*den) [n1] )
             {
                 symmetric = FALSE;
@@ -4155 +4155 @@
   elist->Init( 0 );
 
-  if ( pVariables > 1 )
+  if ( rVar(currRing) > 1 )
   {
     piter= gls;
-    for ( i= 1; i <= pVariables; i++ )
+    for ( i= 1; i <= rVar(currRing); i++ )
       if ( pGetExp( piter, i ) )
       {
@@ -4166 +4166 @@
     while ( piter )
     {
-      for ( i= 1; i <= pVariables; i++ )
+      for ( i= 1; i <= rVar(currRing); i++ )
         if ( (vpos != i) && (pGetExp( piter, i ) != 0) )
         {
@@ -4273 +4273 @@
     return TRUE;
   }
-  if ( n != pVariables )
-  {
-    Werror("Size of first input ideal must be equal to %d!",pVariables);
+  if ( n != rVar(currRing) )
+  {
+    Werror("Size of first input ideal must be equal to %d!",rVar(currRing));
     return TRUE;
   }
@@ -5488 +5488 @@
   int i;
   poly p;
-  for(i=pVariables;i>0;i--)
+  for(i=rVar(currRing);i>0;i--)
   {
     if (e[i]>0)
@@ -5502 +5502 @@
   res->data=(char*)l;
   setFlag(res,FLAG_STD);
-  omFreeSize((ADDRESS)e,(pVariables+1)*sizeof(int));
+  omFreeSize((ADDRESS)e,(rVar(currRing)+1)*sizeof(int));
 }
 BOOLEAN jjVARIABLES_P(leftv res, leftv u)
 {
-  int *e=(int *)omAlloc0((pVariables+1)*sizeof(int));
+  int *e=(int *)omAlloc0((rVar(currRing)+1)*sizeof(int));
   int n=pGetVariables((poly)u->Data(),e);
   jjINT_S_TO_ID(n,e,res);
@@ -5514 +5514 @@
 BOOLEAN jjVARIABLES_ID(leftv res, leftv u)
 {
-  int *e=(int *)omAlloc0((pVariables+1)*sizeof(int));
+  int *e=(int *)omAlloc0((rVar(currRing)+1)*sizeof(int));
   ideal I=(ideal)u->Data();
   int i;