Changeset 17e692 in git

Timestamp:

Mar 8, 1999, 7:11:50 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

2a10547f349f40ba3e6a890b93b03d6cb4b37f52

Parents:

be0d84532eb45d49b654745e810a1a7a534d71ff

Message:

*hannes: use rPar if possible


git-svn-id: file:///usr/local/Singular/svn/trunk@2891 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• fglm.cc (modified) (3 diffs)
• fglmzero.cc (modified) (3 diffs)
• iparith.cc (modified) (4 diffs)
• ipassign.cc (modified) (2 diffs)
• ipshell.cc (modified) (2 diffs)
• longalg.cc (modified) (3 diffs)
• maps.cc (modified) (2 diffs)
• mpsr.h (modified) (2 diffs)
• mpsr_GetMisc.cc (modified) (5 diffs)
• ring.cc (modified) (26 diffs)

Singular/fglm.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglm.cc,v 1.15 1999-03-08 17:30:32 Singular Exp $
+// $Id: fglm.cc,v 1.16 1999-03-08 18:11:39 Singular Exp $
 
 /****************************************
@@ -124 +124 @@
         state= FglmIncompatibleRings;
     }
-    if ( sring->N != dring->N ) {
+    if ( sring->N != dring->N )
+    {
         WerrorS( "rings must have same number of variables" );
         state= FglmIncompatibleRings;
     }
-    if ( sring->P != dring->P ) {
+    if ( rPar(sring) != rPar(dring) )
+    {
         WerrorS( "rings must have same number of parameters" );
         state= FglmIncompatibleRings;
@@ -136 +138 @@
     // check if the names of the variables resp. parameters do agree:
     int nvar = sring->N;
-    int npar = sring->P;
+    int npar = rPar(sring);
     int * pperm;
     if ( npar > 0 )

Singular/fglmzero.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmzero.cc,v 1.20 1999-03-08 17:30:33 Singular Exp $
+// $Id: fglmzero.cc,v 1.21 1999-03-08 18:11:41 Singular Exp $
 
 /****************************************
@@ -141 +141 @@
     maFindPerm( source->names, source->N, NULL, 0, currRing->names, currRing->N, NULL, 0, perm, NULL );
     nSetMap( rInternalChar(source), source->parameter,
-       source->P, source->minpoly );
+       rPar(source), source->minpoly );
 
     matHeader ** temp = (matHeader **)Alloc( _nfunc*sizeof( matHeader * ));
@@ -147 +147 @@
         for ( col= 0, colp= func[var]; col < _size; col++, colp++ ) {
             if ( colp->owner == TRUE ) {
-                for ( row= colp->size-1, elemp= colp->elems; row >= 0; row--, elemp++ ) {
+                for ( row= colp->size-1, elemp= colp->elems; row >= 0;
+                  row--, elemp++ )
+                {
                     newelem= nMap( elemp->elem );
                     nDelete( & elemp->elem );

Singular/iparith.cc

@@ -1488 +1488 @@
     if (iiOp==IMAP_CMD)
     {
-      if (!nSetMap(rInternalChar(r),r->parameter,r->P,r->minpoly))
+      if (!nSetMap(rInternalChar(r),r->parameter,rPar(r),r->minpoly))
       {
         if (iiOp!=IMAP_CMD)
@@ -1508 +1508 @@
         }
         BITSET save_test=test;
-        naSetChar(rInternalChar(r),TRUE,r->parameter,r->P);
-        nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,currRing->P);
+        naSetChar(rInternalChar(r),TRUE,r->parameter,rPar(r));
+        nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,
+          rPar(currRing));
         test=save_test;
       }
@@ -1515 +1516 @@
       if (par_perm_size!=0)
         par_perm=(int *)Alloc0(par_perm_size*sizeof(int));
-      maFindPerm(r->names,       r->N,       r->parameter,        r->P,
-                 currRing->names,currRing->N,currRing->parameter, currRing->P,
+      maFindPerm(r->names,       r->N,       
+                      r->parameter,        rPar(r),
+                 currRing->names,currRing->N,
+                      currRing->parameter, rPar(currRing),
                  perm,par_perm);
     }
@@ -2884 +2887 @@
 static BOOLEAN jjRPAR(leftv res, leftv v)
 {
-  res->data = (char *)((ring)v->Data())->P;
+  res->data = (char *)rPar(((ring)v->Data()));
   return FALSE;
 }

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.45 1999-03-08 17:30:36 Singular Exp $ */
+/* $Id: ipassign.cc,v 1.46 1999-03-08 18:11:45 Singular Exp $ */
 
 /*
@@ -117 +117 @@
 {
   if ((currRing->parameter!=NULL)
-  && ((currRing->P>1)
+  && ((rPar(currRing)>1)
     || (rField_is_GF())))
   {

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.34 1999-03-08 17:30:37 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.35 1999-03-08 18:11:46 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -571 +571 @@
     if (!nSetMap(rInternalChar(IDRING(r)),
                  IDRING(r)->parameter,
-                 IDRING(r)->P,
+                 rPar(IDRING(r)),
                  IDRING(r)->minpoly))
     {

Singular/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.29 1999-03-08 17:30:40 Singular Exp $ */
+/* $Id: longalg.cc,v 1.30 1999-03-08 18:11:47 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -2389 +2389 @@
       for(i=0;i<nop;i++)
       {
-        if ((i>=currRing->P)
+        if ((i>=rPar(currRing))
         ||(strcmp(par[i],currRing->parameter[i])!=0))
            return FALSE;
@@ -2443 +2443 @@
       for(i=0;i<nop;i++)
       {
-        if ((i>=currRing->P)
+        if ((i>=rPar(currRing))
         ||(strcmp(par[i],currRing->parameter[i])!=0))
            return FALSE;

Singular/maps.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: maps.cc,v 1.12 1999-03-08 17:30:41 Singular Exp $ */
+/* $Id: maps.cc,v 1.13 1999-03-08 18:11:48 Singular Exp $ */
 /*
 * ABSTRACT - the mapping of polynomials to other rings
@@ -351 +351 @@
   /* the simplest case:*/
   if(r==currRing) return pCopy(p);
-  nSetMap(rInternalChar(r),r->parameter,r->P,r->minpoly);
+  nSetMap(rInternalChar(r),r->parameter,rPar(r),r->minpoly);
   int *perm=(int *)Alloc0((r->N+1)*sizeof(int));
   //int *par_perm=(int *)Alloc0(rPar(r)*sizeof(int));
-  maFindPerm(r->names,r->N, r->parameter, r->P,
-             currRing->names,currRing->N,currRing->parameter, currRing->P,
+  maFindPerm(r->names,r->N, r->parameter, rPar(r),
+             currRing->names,currRing->N,currRing->parameter, rPar(currRing),
              perm,NULL/*par_perm*/);
   poly res=pPermPoly(p,perm,r/*,par_perm,rPar(r)*/);

Singular/mpsr.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr.h,v 1.13 1999-03-08 17:30:43 Singular Exp $ */
+/* $Id: mpsr.h,v 1.14 1999-03-08 18:11:48 Singular Exp $ */
 /***************************************************************
  *
@@ -100 +100 @@
   {
 #ifdef PDEBUG
-    nSetChar(rInternalChar(rg), TRUE, rg->parameter,rg->P);
+    nSetChar(rInternalChar(rg), TRUE, rg->parameter,rPar(rg));
 #else
-    nSetChar(rInternalChar(rg), complete, rg->parameter,rg->P);
+    nSetChar(rInternalChar(rg), complete, rg->parameter,rPar(rg));
 #endif
     pChangeRing(rg->N, rg->OrdSgn, rg->order, rg->block0, rg->block1,

Singular/mpsr_GetMisc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_GetMisc.cc,v 1.12 1999-03-08 17:30:46 Singular Exp $ */
+/* $Id: mpsr_GetMisc.cc,v 1.13 1999-03-08 18:11:49 Singular Exp $ */
 
 /***************************************************************
@@ -113 +113 @@
   // orig: r1->ch == r2->ch ???
   || (r1->N != r2->N) || (r1->OrdSgn != r2->OrdSgn)
-      || (r1->P != r2->P))
+      || (rPar(r1) != rPar(r2)))
     return 0;
 
@@ -186 +186 @@
   if (r2 == NULL) return 0;
 
-  if ((r1->N > r2->N) || (r1->OrdSgn != r2->OrdSgn) || (r1->P > r2->P))
+  if ((r1->N > r2->N) || (r1->OrdSgn != r2->OrdSgn) || (rPar(r1) > rPar(r2)))
     return 0;
 
@@ -202 +202 @@
     return 0;
   
-  for (i=0; i<r1->P;i++)
+  for (i=0; i<rPar(r1);i++)
   {
       if (strcmp(r1->parameter[i], r2->parameter[i])!=0)
@@ -341 +341 @@
           number nn = (number) l->data;
           mpsr_SetCurrRing(to_ring, TRUE);
-          nSetMap(rInternalChar(from_ring), from_ring->parameter, from_ring->P, from_ring->minpoly);
+          nSetMap(rInternalChar(from_ring), from_ring->parameter,
+            rPar(from_ring), from_ring->minpoly);
           l->data = (void *) nMap(nn);
           mpsr_SetCurrRing(from_ring, FALSE);

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.43 1999-02-10 16:00:04 Singular Exp $ */
+/* $Id: ring.cc,v 1.44 1999-03-08 18:11:50 Singular Exp $ */
 
 /*
@@ -67 +67 @@
 
     /*------------ global variables related to coefficients ------------*/
-    nSetChar(r->ch, complete, r->parameter, r->P);
+    nSetChar(r->ch, complete, r->parameter, rPar(r));
 
     /*------------ global variables related to polys -------------------*/
@@ -161 +161 @@
       if ((rg->parameter!=NULL) && (rg->ch<2))
       {
-        for (i=0;i<rg->P;i++)
+        for (i=0;i<rPar(rg);i++)
         {
           if(strlen(rg->parameter[i])>1)
@@ -731 +731 @@
 
 
-  if ((r->parameter!=NULL)&&(r->ch>1))
+  if (rField_is_GF(r))
     PrintS("//   # ground field : ");
   else
     PrintS("//   characteristic : ");
-  if (r->ch==-1)     PrintS("0 (real)\n");  /* R */
-  else if (r->ch<0)  Print ("%d\n",-r->ch); /* Fp(a) */
-  else if (r->ch==1) PrintS("0\n");         /* Q(a)  */
-  else               Print ("%d\n",r->ch);  /* Fq, Fp, Q */
+  if ( rField_is_R(r) )        PrintS("0 (real)\n");  /* R */
+  else Print ("%d\n",rChar(r)); /* Fp(a) */
   if (r->parameter!=NULL)
   {
@@ -746 +744 @@
       char **sp=r->parameter;
       int nop=0;
-      while (nop<r->P)
+      while (nop<rPar(r))
       {
         PrintS(*sp);
@@ -926 +924 @@
         int len=0;
         char **s=r->parameter;
-        while (len<r->P)
+        while (len<rPar(r))
         {
           FreeL((ADDRESS)*s);
@@ -932 +930 @@
           len++;
         }
-        Free((ADDRESS)r->parameter,r->P*sizeof(char *));
+        Free((ADDRESS)r->parameter,rPar(r)*sizeof(char *));
       }
       Free((ADDRESS)r->VarOffset, (r->N +1)*sizeof(int));
@@ -1206 +1204 @@
   }
   int l=0;
-  for(i=0; i<r->P;i++)
+  for(i=0; i<rPar(r);i++)
   {
     l+=(strlen(r->parameter[i])+1);
@@ -1222 +1220 @@
   tt[0]=',';
   tt[1]='\0';
-  for(i=0; i<r->P;i++)
+  for(i=0; i<rPar(r);i++)
   {
     strcat(s,tt);
@@ -1237 +1235 @@
   int l=2;
 
-  for (i=0; i<r->P; i++)
+  for (i=0; i<rPar(r); i++)
   {
     l+=strlen(r->parameter[i])+1;
@@ -1243 +1241 @@
   char *s=(char *)AllocL(l);
   s[0]='\0';
-  for (i=0; i<r->P-1; i++)
+  for (i=0; i<rPar(r)-1; i++)
   {
     strcat(s,r->parameter[i]);
@@ -1313 +1311 @@
   memset(&tmpR,0,sizeof(tmpR));
   /* check coeff. field =====================================================*/
-  if (r1->ch==r2->ch)
-  {
-    tmpR.ch=r1->ch;
-    if ((r1->ch==0)||(r1->ch>=2)) /* Q, Z/p, GF(p,n) */
+  if (rInternalChar(r1)==rInternalChar(r2))
+  {
+    tmpR.ch=rInternalChar(r1);
+    if (rField_is_Q(r1)||rField_is_Zp(r1)||rField_is_GF(r1)) /*Q, Z/p, GF(p,n)*/
     {
       if (r1->parameter!=NULL)
@@ -1339 +1337 @@
         if (r2->minpoly!=NULL)
         {
-          nSetChar(r1->ch,TRUE,r1->parameter,r1->P);
+          nSetChar(rInternalChar(r1),TRUE,r1->parameter,rPar(r1));
           if ((strcmp(r1->parameter[0],r2->parameter[0])==0) /* 1 char */
               && naEqual(r1->minpoly,r2->minpoly))
@@ -1347 +1345 @@
             tmpR.minpoly=naCopy(r1->minpoly);
             tmpR.P=1;
-            nSetChar(currRing->ch,TRUE,currRing->parameter,currRing->P);
+            nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,
+              rPar(currRing));
           }
           else
           {
-            nSetChar(currRing->ch,TRUE,currRing->parameter,currRing->P);
+            nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,
+              rPar(currRing));
             WerrorS("different minpolys");
             return -1;
@@ -1359 +1359 @@
         {
           if ((strcmp(r1->parameter[0],r2->parameter[0])==0) /* 1 char */
-              && (r2->P==1))
+              && (rPar(r2)==1))
           {
             tmpR.parameter=(char **)Alloc0(sizeof(char *));
             tmpR.parameter[0]=mstrdup(r1->parameter[0]);
             tmpR.P=1;
-            nSetChar(r1->ch,TRUE,r1->parameter,r1->P);
+            nSetChar(rInternalChar(r1),TRUE,r1->parameter,rPar(r1));
             tmpR.minpoly=naCopy(r1->minpoly);
-            nSetChar(currRing->ch,TRUE,currRing->parameter,currRing->P);
+            nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,
+              rPar(currRing));
           }
           else
@@ -1380 +1381 @@
         {
           if ((strcmp(r1->parameter[0],r2->parameter[0])==0) /* 1 char */
-              && (r1->P==1))
+              && (rPar(r1)==1))
           {
             tmpR.parameter=(char **)Alloc(sizeof(char *));
             tmpR.parameter[0]=mstrdup(r1->parameter[0]);
             tmpR.P=1;
-            nSetChar(r2->ch,TRUE,r2->parameter,r2->P);
+            nSetChar(rInternalChar(r2),TRUE,r2->parameter,rPar(r2));
             tmpR.minpoly=naCopy(r2->minpoly);
-            nSetChar(currRing->ch,TRUE,currRing->parameter,currRing->P);
+            nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,
+              rPar(currRing));
           }
           else
@@ -1400 +1402 @@
           tmpR.parameter=(char **)Alloc(len*sizeof(char *));
           int i;
-          for (i=0;i<r1->P;i++)
+          for (i=0;i<rPar(r1);i++)
           {
             tmpR.parameter[i]=mstrdup(r1->parameter[i]);
           }
           int j,l;
-          for(j=0;j<r2->P;j++)
+          for(j=0;j<rPar(r2);j++)
           {
             for(l=0;l<i;l++)
@@ -1433 +1435 @@
           || (r2->ch==-r1->ch)) /* Z/p */
       {
-        tmpR.ch=r1->ch;
+        tmpR.ch=rInternalChar(r1);
         tmpR.parameter=(char **)Alloc(rPar(r1)*sizeof(char *));
-        tmpR.P=r1->P;
+        tmpR.P=rPar(r1);
         memcpy(tmpR.parameter,r1->parameter,rPar(r1)*sizeof(char *));
         if (r1->minpoly!=NULL)
         {
-          nSetChar(r1->ch,TRUE,r1->parameter,r1->P);
+          nSetChar(rInternalChar(r1),TRUE,r1->parameter,rPar(r1));
           tmpR.minpoly=naCopy(r1->minpoly);
-          nSetChar(currRing->ch,TRUE,currRing->parameter,currRing->P);
+          nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,
+            rPar(currRing));
         }
       }
@@ -1459 +1462 @@
       if ((r2->ch<-1)||(r2->ch==1)) /* Z/p(a),Q(a) */
       {
-        tmpR.ch=r2->ch;
-        tmpR.P=r2->P;
+        tmpR.ch=rInternalChar(r2);
+        tmpR.P=rPar(r2);
         tmpR.parameter=(char **)Alloc(rPar(r2)*sizeof(char *));
         memcpy(tmpR.parameter,r2->parameter,rPar(r2)*sizeof(char *));
         if (r2->minpoly!=NULL)
         {
-          nSetChar(r1->ch,TRUE,r1->parameter,r1->P);
+          nSetChar(rInternalChar(r1),TRUE,r1->parameter,rPar(r1));
           tmpR.minpoly=naCopy(r2->minpoly);
-          nSetChar(currRing->ch,TRUE,currRing->parameter,currRing->P);
+          nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,
+            rPar(currRing));
         }
       }
@@ -1490 +1494 @@
       if (r2->ch==0) /* Q */
       {
-        tmpR.ch=r1->ch;
+        tmpR.ch=rInternalChar(r1);
         tmpR.P=rPar(r1);
         tmpR.parameter=(char **)Alloc0(rPar(r1)*sizeof(char *));
         int i;
-        for(i=0;i<r1->P;i++)
+        for(i=0;i<rPar(r1);i++)
         {
           tmpR.parameter[i]=mstrdup(r1->parameter[i]);
@@ -1500 +1504 @@
         if (r1->minpoly!=NULL)
         {
-          nSetChar(r1->ch,TRUE,r1->parameter,r1->P);
+          nSetChar(rInternalChar(r1),TRUE,r1->parameter,rPar(r1));
           tmpR.minpoly=naCopy(r1->minpoly);
-          nSetChar(currRing->ch,TRUE,currRing->parameter,currRing->P);
+          nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,
+            rPar(currRing));
         }
       }
@@ -1519 +1524 @@
       else if (r2->ch==-r1->ch) /* Z/p(a) */
       {
-        tmpR.ch=r2->ch;
+        tmpR.ch=rInternalChar(r2);
         tmpR.P=rPar(r2);
         tmpR.parameter=(char **)Alloc(rPar(r2)*sizeof(char *));
         int i;
-        for(i=0;i<r2->P;i++)
+        for(i=0;i<rPar(r2);i++)
         {
           tmpR.parameter[i]=mstrdup(r2->parameter[i]);
@@ -1529 +1534 @@
         if (r2->minpoly!=NULL)
         {
-          nSetChar(r2->ch,TRUE,r2->parameter,r2->P);
+          nSetChar(rInternalChar(r2),TRUE,r2->parameter,rPar(r2));
           tmpR.minpoly=naCopy(r2->minpoly);
-          nSetChar(currRing->ch,TRUE,currRing->parameter,currRing->P);
+          nSetChar(rInternalChar(currRing),TRUE,currRing->parameter,
+            rPar(currRing));
         }
       }
@@ -1557 +1563 @@
     else if ((r2->parameter!=NULL) && (strlen(r1->names[i])==1))
     {
-      for(j=0;j<r2->P;j++)
+      for(j=0;j<rPar(r2);j++)
       {
         if (strcmp(r1->names[i],r2->parameter[j])==0)
@@ -1586 +1592 @@
     else if ((r1->parameter!=NULL) && (strlen(r2->names[i])==1))
     {
-      for(j=0;j<r1->P;j++)
+      for(j=0;j<rPar(r1);j++)
       {
         if (strcmp(r2->names[i],r1->parameter[j])==0)
@@ -1760 +1766 @@
     res->parameter=(char **)Alloc(l*sizeof(char *));
     int i;
-    for(i=0;i<r->P;i++)
+    for(i=0;i<rPar(r);i++)
     {
       res->parameter[i]=mstrdup(r->parameter[i]);