Changeset ca90c60 in git

Timestamp:

Nov 19, 2014, 7:20:41 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

df98dde0a2af92f16bbf255c865a7f03cfdba275

Parents:

13298a1faecd114965bad6615ffff17b13c6ea0d

Message:

Added missing wrappers for coeffs->virtual methods and fix their usage

Files:

• Singular/calcSVD.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (4 diffs)
• Singular/ipconv.cc (modified) (4 diffs)
• Singular/ipprint.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (2 diffs)
• Singular/links/ssiLink.cc (modified) (3 diffs)
• Singular/number2.cc (modified) (1 diff)
• libpolys/coeffs/bigintmat.cc (modified) (1 diff)
• libpolys/coeffs/test.cc (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (1 diff)
• libpolys/polys/coeffrings.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (4 diffs)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)

Singular/calcSVD.cc

@@ -18 +18 @@
 {
   poly p=pInit();
-  currRing->cf->nRead(s,&pGetCoeff(p));
+  n_Read(s, &pGetCoeff(p), currRing->cf);
   return p;
 }

Singular/iparith.cc

@@ -1803 +1803 @@
     if (nMap==NULL)
     {
-      Werror("not implemented: map bigint -> %s",cf->cfCoeffString(cf));
+      Werror("not implemented: map bigint -> %s", nCoeffString(cf));
       return TRUE;
     }
@@ -2342 +2342 @@
 err_fetch:
   Werror("no identity map from %s (%s -> %s)",u->Fullname(),
-    r->cf->cfCoeffString(r->cf),
-    currRing->cf->cfCoeffString(currRing->cf));
+         nCoeffString(r->cf),
+         nCoeffString(currRing->cf));
   return TRUE;
 }
@@ -3753 +3753 @@
   else
   {
-    Werror("cannot convert bigint to cring %s",currRing->cf->cfCoeffString(currRing->cf));
+    Werror("cannot convert bigint to cring %s", nCoeffString(currRing->cf));
     bo=TRUE;
   }
@@ -6271 +6271 @@
   if ((cf!=NULL) && (cf->cfRandom!=NULL))
   {
-    number n=cf->cfRandom(siRand,(number)v->Data(),(number)w->Data(),cf);
+    number n= n_Random(siRand,(number)v->Data(),(number)w->Data(),cf);
     number2 nn=(number2)omAlloc(sizeof(*nn));
     nn->cf=cf;

Singular/ipconv.cc

@@ -58 +58 @@
   if (nMap==NULL)
   {
-    Werror("no conversion from bigint to %s",currRing->cf->cfCoeffString(currRing->cf));
+    Werror("no conversion from bigint to %s", nCoeffString(currRing->cf));
     return NULL;
   }
@@ -79 +79 @@
   if (nMap==NULL)
   {
-    Werror("no conversion from bigint to %s",currRing->cf->cfCoeffString(currRing->cf));
+    Werror("no conversion from bigint to %s", nCoeffString(currRing->cf));
     return NULL;
   }
@@ -102 +102 @@
   if (nMap==NULL)
   {
-    Werror("no conversion from bigint to %s",currRing->cf->cfCoeffString(currRing->cf));
+    Werror("no conversion from bigint to %s", nCoeffString(currRing->cf));
     return NULL;
   }
@@ -186 +186 @@
   if (nMap==NULL)
   {
-    Werror("no conversion from bigint to %s",currRing->cf->cfCoeffString(currRing->cf));
+    Werror("no conversion from bigint to %s", nCoeffString(currRing->cf));
     return NULL;
   }

Singular/ipprint.cc

@@ -222 +222 @@
   }
   else PrintS("field: ");
-  PrintS(r->cfCoeffName(r));
+  PrintS(nCoeffName(r));
   return FALSE;
 }

Singular/ipshell.cc

@@ -228 +228 @@
     case CNUMBER_CMD:
                    {  number2 n=(number2)IDDATA(h);
-                      Print(" (%s)",n->cf->cfCoeffName(n->cf));
+                      Print(" (%s)",nCoeffName(n->cf));
                       break;
                    }
@@ -235 +235 @@
                       Print(" %d x %d (%s)",
                         b->rows(),b->cols(),
-                        b->basecoeffs()->cfCoeffName(b->basecoeffs()));
+                        nCoeffName(b->basecoeffs()));
                       break;
                    }

Singular/links/ssiLink.cc

@@ -120 +120 @@
 void ssiWriteBigInt(const ssiInfo *d, const number n)
 {
- coeffs_BIGINT->cfWriteFd(n,d->f_write,coeffs_BIGINT);
+ n_WriteFd(n,d->f_write,coeffs_BIGINT);
 }
 
@@ -146 +146 @@
   else if (cf->cfWriteFd!=NULL)
   {
-    cf->cfWriteFd(n,d->f_write,cf);
+    n_WriteFd(n,d->f_write,cf);
   }
   else WerrorS("coeff field not implemented");
@@ -390 +390 @@
   if (cf->cfReadFd!=NULL)
   {
-     return cf->cfReadFd(d->f_read,cf);
+     return n_ReadFd(d->f_read,cf);
   }
   else if (getCoeffType(cf) == n_transExt)

Singular/number2.cc

@@ -19 +19 @@
     return omStrDup("oo");
   }
-  return omStrDup(c->cfCoeffName(c));
+  return omStrDup(nCoeffName(c));
 }
 void crPrint(coeffs c)

libpolys/coeffs/bigintmat.cc

@@ -1557 +1557 @@
     char * s;
     ::Print("mat over Z is \n");
-    ::Print("%s\n", s = basecoeffs()->cfCoeffString(basecoeffs()));
+    ::Print("%s\n", s = nCoeffString(basecoeffs()));
     omFree(s);
     Print();

libpolys/coeffs/test.cc

@@ -186 +186 @@
   assume( r->cfAdd != NULL );
   assume( r->cfDelete != NULL );
-
-  if( type == n_Q )
-  {
-    assume( r->cfInit == nlInit );
-    assume( r->cfAdd == nlAdd );
-    assume( r->cfDelete == nlDelete );
-  }
-  else if( type == n_long_R )
-  {
-    assume( r->cfInit == ngfInit );
-    assume( r->cfAdd == ngfAdd );
-    assume( r->cfDelete == ngfDelete );
-  }
-  else if( type == n_long_C )
-  {
-//     assume( r->cfInit == ngcInit );
-//     assume( r->cfAdd == ngcAdd );
-//     assume( r->cfDelete == ngcDelete );
-  }
-  else if( type == n_R )
-  {
-    assume( r->cfInit == nrInit );
-    assume( r->cfAdd == nrAdd );
-//    assume( r->cfDelete == nrDelete ); // No?
-  }
-#ifdef HAVE_RINGS
-  else if( type == n_Z2m )
-  {
-    assume( r->cfInit == nr2mInit );
-    assume( r->cfAdd == nr2mAdd );
-    assume( r->cfDelete == ndDelete );
-  }
-  else if( type == n_Zn )
-  {
-    assume( r->cfInit == nrnInit );
-    assume( r->cfAdd == nrnAdd );
-    assume( r->cfDelete == nrnDelete );
-  }
-#endif
-  else if( type == n_GF )
-  {
-//     assume( r->cfInit == nfInit );
-//     assume( r->cfAdd == nfAdd );
-    //assume( r->cfDelete == nfDelete );
-  }
-  else
-  {
-    // ...
-  }
-
+  assume( r->cfKillChar != NULL );
+   
   bool ret = TestArith( r );
 

libpolys/polys/clapsing.cc

@@ -1630 +1630 @@
     for(j=m->cols();j>0;j--)
     {
-      M(i,j)=cf->convSingNFactoryN(BIMATELEM(*m,i,j),setchar,cf);
+      M(i,j)=n_convSingNFactoryN(BIMATELEM(*m,i,j),setchar,cf);
       setchar=FALSE;
     }
   }
-  number res= cf->convFactoryNSingN( determinant(M,m->rows()),cf ) ;
+  number res=n_convFactoryNSingN( determinant(M,m->rows()),cf ) ;
   return res;
 }

libpolys/polys/coeffrings.h

@@ -9 +9 @@
 static inline void n_Delete(number* p, const ring r){ n_Delete(p, r->cf); }
 static inline BOOLEAN n_Equal(number a, number b, const ring r){ return n_Equal(a, b, r->cf); }
-static inline nMapFunc n_SetMap(const ring src, const ring dst){ return dst->cf->cfSetMap(src->cf,dst->cf); }
+static inline nMapFunc n_SetMap(const ring src, const ring dst){ return n_SetMap(src->cf,dst->cf); }
 static inline int n_GetChar(const ring r){ return n_GetChar(r->cf); }
 

libpolys/polys/monomials/p_polys.cc

@@ -1361 +1361 @@
   int i,j;
   rc = p_Init(r);
-  const char *s = r->cf->cfRead(st,&(rc->coef),r->cf);
+  const char *s = n_Read(st,&(p_GetCoeff(rc, r)),r->cf);
   if (s==st)
   /* i.e. it does not start with a coeff: test if it is a ringvar*/
@@ -2765 +2765 @@
       while (p!=NULL)
       {
-        /* should be:
+        /* should be: // NOTE: don't use ->coef!!!!
         * number hh;
         * nGetDenom(p->coef,&hh);
@@ -2906 +2906 @@
       while (p!=NULL)
       {
-        /* should be:
+        /* should be: // NOTE: don't use ->coef!!!!
         * number hh;
         * nGetDenom(p->coef,&hh);
@@ -2941 +2941 @@
             while (p!=NULL)
             {
-              /* should be:
+              /* should be: // NOTE: don't use ->coef!!!!
               * number hh;
               * nGetDenom(p->coef,&hh);

libpolys/polys/monomials/ring.cc

@@ -617 +617 @@
 /// TODO: make it a virtual method of coeffs, together with:
 /// Decompose & Compose, rParameter & rPar
-char * rCharStr(ring r)
-{ return r->cf->cfCoeffString(r->cf); }
+char * rCharStr(const ring r){ assume( r != NULL ); return nCoeffString(r->cf); }
 
 char * rParStr(ring r)