Changeset ce3f53c in git

Timestamp:

May 6, 2011, 11:51:40 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

fba6f18e59118e933bb2d9c5b69b31879517ddff

Parents:

d75f15102ef5a6cd3463bf6f11b85177f916e01b

git-author:

Martin Lee <martinlee84@web.de>2011-05-06 11:51:40+02:00

git-committer:

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

Message:

adapted conversion to and from factory

Location:

libpolys/polys

Files:

• clapconv.h (modified) (2 diffs)
• clapsing.cc (modified) (83 diffs)
• clapsing.h (modified) (2 diffs)
• monomials/p_polys.cc (modified) (1 diff)

libpolys/polys/clapconv.h

@@ -19 +19 @@
 #endif /* HAVE_FACTORY */
 
-poly convFactoryPSingP ( const CanonicalForm & f, const ring r=currRing );
-CanonicalForm convSingPFactoryP( poly p, const ring r=currRing );
+poly convFactoryPSingP ( const CanonicalForm & f, const ring r );
+CanonicalForm convSingPFactoryP( poly p, const ring r );
 
 CanonicalForm convSingAPFactoryAP ( poly p , const Variable & a, const ring r );
@@ -26 +26 @@
 poly convFactoryAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start );
 
-CanonicalForm convSingGFFactoryGF ( poly p );
-poly convFactoryGFSingGF ( const CanonicalForm & f );
+CanonicalForm convSingGFFactoryGF ( poly p, const ring r );
+poly convFactoryGFSingGF ( const CanonicalForm & f, const ring r );
 
-CanonicalForm convSingAFactoryA ( napoly p , const Variable & a, const ring r );
-napoly convFactoryASingA ( const CanonicalForm & f, const ring r );
+CanonicalForm convSingAFactoryA ( number p , const Variable & a, const ring r );
+number convFactoryASingA ( const CanonicalForm & f, const ring r );
 
-CanonicalForm convSingTrPFactoryP ( poly p, const ring r=currRing );
-poly convFactoryPSingTrP ( const CanonicalForm & f, const ring r=currRing );
+CanonicalForm convSingTrPFactoryP ( poly p, const ring r );
+poly convFactoryPSingTrP ( const CanonicalForm & f, const ring r );
 
 // CanonicalForm convSingIFactoryI( int i);a <- by constructor of CanonicalForm

libpolys/polys/clapsing.cc

@@ -30 +30 @@
 #include "monomials/ring.h"
 #include "simpleideals.h"
-
+//#include "polys.h"
 
 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
@@ -57 +57 @@
   if (rField_is_Q(r) || (rField_is_Zp(r)))
   {
-    setCharacteristic( n_GetChar(r->cf) );
+    setCharacteristic( rChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g, r ) );
     res=convFactoryPSingP( gcd( F, G ) , r);
@@ -65 +65 @@
   {
     if ( rField_is_Q_a(r)) setCharacteristic( 0 );
-    else                   setCharacteristic( -n_GetChar(r) );
-    if (r->minpoly!=NULL)
+    else                   setCharacteristic( -rChar(r) );
+    if (r->cf->algring->minideal!=NULL)
     {
       bool b1=isOn(SW_USE_QGCD);
       bool b2=isOn(SW_USE_fieldGCD);
-      if ( rField_is_Q_a() ) On(SW_USE_QGCD);
+      if ( rField_is_Q_a(r) ) On(SW_USE_QGCD);
       else                   On(SW_USE_fieldGCD);
-      CanonicalForm mipo=convSingPFactoryP(((lnumber)r->minpoly)->z,
-                                           r->algring);
+      CanonicalForm mipo=convSingPFactoryP(r->cf->algring->minideal->m[0],
+                                           r->cf->algring);
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a,r ) ),
                     G( convSingAPFactoryAP( g,a,r ) );
-      res= convFactoryAPSingAP( gcd( F, G ),currRing );
+      res= convFactoryAPSingAP( gcd( F, G ),r );
       if (!b1) Off(SW_USE_QGCD);
       if (!b2) Off(SW_USE_fieldGCD);
@@ -106 +106 @@
 }
 
-poly singclap_gcd ( poly f, poly g )
+poly singclap_gcd ( poly f, poly g, const ring r)
 {
   poly res=NULL;
 
-  if (f!=NULL) p_Cleardenom(f, currRing);
-  if (g!=NULL) p_Cleardenom(g, currRing);
+  if (f!=NULL) p_Cleardenom(f, r);
+  if (g!=NULL) p_Cleardenom(g, r);
   else         return f; // g==0 => gcd=f (but do a p_Cleardenom)
   if (f==NULL) return g; // f==0 => gcd=g (but do a p_Cleardenom)
 
-  res=singclap_gcd_r(f,g,currRing);
-  pDelete(&f);
-  pDelete(&g);
+  res=singclap_gcd_r(f,g,r);
+  p_Delete(&f, r);
+  p_Delete(&g, r);
   return res;
 }
 
 /*2 find the maximal exponent of var(i) in poly p*/
-int pGetExp_Var(poly p, int i)
+int pGetExp_Var(poly p, int i, const ring r)
 {
   int m=0;
@@ -128 +128 @@
   while (p!=NULL)
   {
-    mm=pGetExp(p,i);
+    mm=p_GetExp(p,i,r);
     if (mm>m) m=mm;
     pIter(p);
@@ -136 +136 @@
 
 // destroys f,g,x
-poly singclap_resultant ( poly f, poly g , poly x)
+poly singclap_resultant ( poly f, poly g , poly x, const ring r)
 {
   poly res=NULL;
-  int i=pIsPurePower(x);
+  int i=p_IsPurePower(x, r);
   if (i==0)
   {
@@ -149 +149 @@
   // for now there is only the possibility to handle polynomials over
   // Q and Fp ...
-  if (rField_is_Zp() || rField_is_Q())
+  if (rField_is_Zp(r) || rField_is_Q(r))
   {
     Variable X(i);
-    setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPFactoryP( f ) ), G( convSingPFactoryP( g ) );
-    res=convFactoryPSingP( resultant( F, G, X ) );
+    setCharacteristic( rChar(r) );
+    CanonicalForm F( convSingPFactoryP( f, r ) ), G( convSingPFactoryP( g, r ) );
+    res=convFactoryPSingP( resultant( F, G, X ), r );
     Off(SW_RATIONAL);
     goto resultant_returns_res;
   }
   // and over Q(a) / Fp(a)
-  else if (rField_is_Extension())
-  {
-    if (rField_is_Q_a()) setCharacteristic( 0 );
-    else               setCharacteristic( -nGetChar() );
-    Variable X(i+rPar(currRing));
-    if (currRing->minpoly!=NULL)
+  else if (rField_is_Extension(r))
+  {
+    if (rField_is_Q_a(r)) setCharacteristic( 0 );
+    else               setCharacteristic( - rChar(r) );
+    Variable X(i+rPar(r));
+    if (r->cf->algring->minideal!=NULL)
     {
       //Variable X(i);
-      CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                                 currRing->algring);
+      CanonicalForm mipo=convSingPFactoryP(r->cf->algring->minideal->m[0],
+                                           r->cf->algring);
       Variable a=rootOf(mipo);
-      CanonicalForm F( convSingAPFactoryAP( f,a,currRing ) ),
-                    G( convSingAPFactoryAP( g,a,currRing ) );
-      res= convFactoryAPSingAP( resultant( F, G, X ),currRing );
+      CanonicalForm F( convSingAPFactoryAP( f,a,r ) ),
+                    G( convSingAPFactoryAP( g,a,r ) );
+      res= convFactoryAPSingAP( resultant( F, G, X ),r );
     }
     else
@@ -178 +178 @@
       //Variable X(i+rPar(currRing));
       number nf,ng;
-      p_Cleardenom_n(f, currRing,nf);p_Cleardenom_n(g, currRing,ng);
+      p_Cleardenom_n(f, r,nf);p_Cleardenom_n(g, r,ng);
       int ef,eg;
-      ef=pGetExp_Var(f,i);
-      eg=pGetExp_Var(g,i);
-      CanonicalForm F( convSingTrPFactoryP( f ) ), G( convSingTrPFactoryP( g ) );
-      res= convFactoryPSingTrP( resultant( F, G, X ) );
-      if ((nf!=NULL)&&(!nIsOne(nf))&&(!nIsZero(nf)))
-      {
-        number n=nInvers(nf);
+      ef=pGetExp_Var(f,i,r);
+      eg=pGetExp_Var(g,i,r);
+      CanonicalForm F( convSingTrPFactoryP( f, r ) ), G( convSingTrPFactoryP( g, r ) );
+      res= convFactoryPSingTrP( resultant( F, G, X ), r );
+      if ((nf!=NULL)&&(!n_IsOne(nf,r->cf))&&(!n_IsZero(nf,r->cf)))
+      {
+        number n=n_Invers(nf,r->cf);
         while(eg>0)
         {
-          res=pMult_nn(res,n);
+          res=p_Mult_nn(res,n,r);
           eg--;
         }
-        nDelete(&n);
-      }
-      nDelete(&nf);
-      if ((ng!=NULL)&&(!nIsOne(ng))&&(!nIsZero(ng)))
-      {
-        number n=nInvers(ng);
+        n_Delete(&n,r->cf);
+      }
+      n_Delete(&nf, r->cf);
+      if ((ng!=NULL)&&(!n_IsOne(ng, r->cf))&&(!n_IsZero(ng,r->cf)))
+      {
+        number n=n_Invers(ng,r->cf);
         while(ef>0)
         {
-          res=pMult_nn(res,n);
+          res=p_Mult_nn(res,n,r);
           ef--;
         }
-        nDelete(&n);
-      }
-      nDelete(&ng);
+        n_Delete(&n,r->cf);
+      }
+      n_Delete(&ng,r->cf);
     }
     Off(SW_RATIONAL);
@@ -213 +213 @@
     WerrorS( feNotImplemented );
 resultant_returns_res:
-  pDelete(&f);
-  pDelete(&g);
-  pDelete(&x);
+  p_Delete(&f,r);
+  p_Delete(&g,r);
+  p_Delete(&x,r);
   return res;
 }
@@ -278 +278 @@
 //}
 
-BOOLEAN singclap_extgcd ( poly f, poly g, poly &res, poly &pa, poly &pb )
+BOOLEAN singclap_extgcd ( poly f, poly g, poly &res, poly &pa, poly &pb , const ring r)
 {
   // for now there is only the possibility to handle univariate
@@ -285 +285 @@
   res=NULL;pa=NULL;pb=NULL;
   On(SW_SYMMETRIC_FF);
-  if (rField_is_Zp() || rField_is_Q())
-  {
-    setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPFactoryP( f ) ), G( convSingPFactoryP( g ) );
+  if (rField_is_Zp(r) || rField_is_Q(r))
+  {
+    setCharacteristic( rChar(r) );
+    CanonicalForm F( convSingPFactoryP( f, r ) ), G( convSingPFactoryP( g, r ) );
     CanonicalForm FpG=F+G;
     if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
@@ -299 +299 @@
     CanonicalForm Fa,Gb;
     On(SW_RATIONAL);
-    res=convFactoryPSingP( extgcd( F, G, Fa, Gb ) );
-    pa=convFactoryPSingP(Fa);
-    pb=convFactoryPSingP(Gb);
+    res=convFactoryPSingP( extgcd( F, G, Fa, Gb ), r );
+    pa=convFactoryPSingP(Fa, r);
+    pb=convFactoryPSingP(Gb, r);
     Off(SW_RATIONAL);
   }
   // and over Q(a) / Fp(a)
-  else if (rField_is_Extension())
-  {
-    if (rField_is_Q_a()) setCharacteristic( 0 );
-    else               setCharacteristic( -nGetChar() );
+  else if (rField_is_Extension(r))
+  {
+    if (rField_is_Q_a(r)) setCharacteristic( 0 );
+    else               setCharacteristic( - rChar(r) );
     CanonicalForm Fa,Gb;
-    if (currRing->minpoly!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                                 currRing->algring);
+    if (r->cf->algring->minideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->algring->minideal->m[0],
+                                           r->cf->algring);
       Variable a=rootOf(mipo);
-      CanonicalForm F( convSingAPFactoryAP( f,a,currRing ) ),
-                    G( convSingAPFactoryAP( g,a,currRing ) );
+      CanonicalForm F( convSingAPFactoryAP( f,a,r ) ),
+                    G( convSingAPFactoryAP( g,a,r ) );
       CanonicalForm FpG=F+G;
       if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
@@ -324 +324 @@
         return TRUE;
       }
-      res= convFactoryAPSingAP( extgcd( F, G, Fa, Gb ),currRing );
-      pa=convFactoryAPSingAP(Fa,currRing);
-      pb=convFactoryAPSingAP(Gb,currRing);
+      res= convFactoryAPSingAP( extgcd( F, G, Fa, Gb ),r );
+      pa=convFactoryAPSingAP(Fa,r);
+      pb=convFactoryAPSingAP(Gb,r);
     }
     else
     {
-      CanonicalForm F( convSingTrPFactoryP( f ) ), G( convSingTrPFactoryP( g ) );
+      CanonicalForm F( convSingTrPFactoryP( f,r ) ), G( convSingTrPFactoryP( g,r ) );
       CanonicalForm FpG=F+G;
       if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
@@ -339 +339 @@
         return TRUE;
       }
-      res= convFactoryPSingTrP( extgcd( F, G, Fa, Gb ) );
-      pa=convFactoryPSingTrP(Fa);
-      pb=convFactoryPSingTrP(Gb);
+      res= convFactoryPSingTrP( extgcd( F, G, Fa, Gb ),r );
+      pa=convFactoryPSingTrP(Fa,r);
+      pb=convFactoryPSingTrP(Gb,r);
     }
     Off(SW_RATIONAL);
@@ -353 +353 @@
   // checking the result of extgcd:
   poly dummy;
-  dummy=pSub(pAdd(pMult(pCopy(f),pCopy(pa)),pMult(pCopy(g),pCopy(pb))),pCopy(res));
+  dummy=p_Sub(p_Add_q(pp_Mult_qq(f,pa,r),pp_Mult_qq(g,pb,r),r),p_Copy(res,r),r);
   if (dummy!=NULL)
   {
-    PrintS("extgcd( ");pWrite(f);pWrite0(g);PrintS(" )\n");
-    PrintS("gcd, co-factors:");pWrite(res); pWrite(pa);pWrite(pb);
-    pDelete(&dummy);
+    PrintS("extgcd( ");p_Write(f,r);p_Write0(g,r);PrintS(" )\n");
+    PrintS("gcd, co-factors:");p_Write(res,r); p_Write(pa,r);p_Write(pb,r);
+    p_Delete(&dummy,r);
   }
 #endif
@@ -373 +373 @@
   if ( rField_is_Q(r) || rField_is_Zp(r) )
   {
-    setCharacteristic( n_GetChar(r) );
+    setCharacteristic( rChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r) );
     CanonicalForm FpG=F+G;
@@ -394 +394 @@
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
-    else                 setCharacteristic( -n_GetChar(r) );
+    else                 setCharacteristic( - rChar(r) );
     CanonicalForm Fa,Gb;
-    if (r->minpoly!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(((lnumber)r->minpoly)->z,
-                                            r->algring);
+    if (r->cf->algring->minideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->algring->minideal->m[0],
+                                           r->cf->algring);
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a,r ) ),
@@ -410 +410 @@
         return TRUE;
       }
-      res= convFactoryAPSingAP( extgcd( F, G, Fa, Gb ),currRing );
-      pa=convFactoryAPSingAP(Fa,currRing);
-      pb=convFactoryAPSingAP(Gb,currRing);
+      res= convFactoryAPSingAP( extgcd( F, G, Fa, Gb ),r );
+      pa=convFactoryAPSingAP(Fa,r);
+      pb=convFactoryAPSingAP(Gb,r);
     }
     else
@@ -439 +439 @@
 }
 
-poly singclap_pdivide ( poly f, poly g )
+poly singclap_pdivide ( poly f, poly g, const ring r )
 {
   poly res=NULL;
   On(SW_RATIONAL);
-  if (rField_is_Zp() || rField_is_Q())
-  {
-    setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPFactoryP( f ) ), G( convSingPFactoryP( g ) );
-    res = convFactoryPSingP( F / G );
-  }
-  else if (rField_is_Extension())
-  {
-    if (rField_is_Q_a()) setCharacteristic( 0 );
-    else               setCharacteristic( -nGetChar() );
-    if (currRing->minpoly!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                                 currRing->algring);
+  if (rField_is_Zp(r) || rField_is_Q(r))
+  {
+    setCharacteristic( rChar(r) );
+    CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r ) );
+    res = convFactoryPSingP( F / G, r );
+  }
+  else if (rField_is_Extension(r))
+  {
+    if (rField_is_Q_a(r)) setCharacteristic( 0 );
+    else               setCharacteristic( - rChar(r) );
+    if (r->cf->algring->minideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->algring->minideal->m[0],
+                                           r->cf->algring);
       Variable a=rootOf(mipo);
-      CanonicalForm F( convSingAPFactoryAP( f,a,currRing ) ),
-                    G( convSingAPFactoryAP( g,a,currRing ) );
-      res= convFactoryAPSingAP(  F / G,currRing  );
+      CanonicalForm F( convSingAPFactoryAP( f,a,r ) ),
+                    G( convSingAPFactoryAP( g,a,r ) );
+      res= convFactoryAPSingAP(  F / G,r );
     }
     else
     {
-      CanonicalForm F( convSingTrPFactoryP( f ) ), G( convSingTrPFactoryP( g ) );
-      res= convFactoryPSingTrP(  F / G  );
+      CanonicalForm F( convSingTrPFactoryP( f,r ) ), G( convSingTrPFactoryP( g,r ) );
+      res= convFactoryPSingTrP(  F / G,r  );
     }
   }
@@ -489 +489 @@
   if (rField_is_Zp(r) || rField_is_Q(r))
   {
-    setCharacteristic( n_GetChar(r) );
+    setCharacteristic( rChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r ) );
     res = convFactoryPSingP( F / G,r );
@@ -496 +496 @@
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
-    else               setCharacteristic( -n_GetChar(r) );
-    if (r->minpoly!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(((lnumber)r->minpoly)->z,
-                                                 r->algring);
+    else               setCharacteristic( - rChar(r) );
+    if (r->cf->algring->minideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->algring->minideal->m[0],
+                                           r->cf->algring);
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a,r ) ),
@@ -527 +527 @@
 }
 
-void singclap_divide_content ( poly f )
+void singclap_divide_content ( poly f, const ring r )
 {
   if ( f==NULL )
@@ -535 +535 @@
   else  if ( pNext( f ) == NULL )
   {
-    pSetCoeff( f, nInit( 1 ) );
+    p_SetCoeff( f, n_Init( 1, r->cf ), r );
     return;
   }
   else
   {
-    if ( rField_is_Q_a() )
+    if ( rField_is_Q_a(r) )
       setCharacteristic( 0 );
-    else  if ( rField_is_Zp_a() )
-      setCharacteristic( -nGetChar() );
+    else  if ( rField_is_Zp_a(r) )
+      setCharacteristic( -rChar(r) );
     else
       return; /* not implemented*/
@@ -556 +556 @@
     number g2=pGetCoeff(p); // p==pNext(f);
     pIter(p);
-    int sz1=nSize(g1);
-    int sz2=nSize(g2);
+    int sz1=n_Size(g1, r->cf);
+    int sz2=n_Size(g2, r->cf);
     if (sz1>sz2)
     {
@@ -567 +567 @@
     while (p!=NULL)
     {
-      int n_sz=nSize(pGetCoeff(p));
+      int n_sz=n_Size(pGetCoeff(p),r->cf);
       if (n_sz<sz1)
       {
@@ -584 +584 @@
       pIter(p);
     }
-    g = convSingPFactoryP( ((lnumber)g1)->z, currRing->algring );
-    g = gcd( g, convSingPFactoryP( ((lnumber)g2)->z , currRing->algring));
+    g = convSingPFactoryP( ((lnumber)g1)->z, r->cf->algring );
+    g = gcd( g, convSingPFactoryP( ((lnumber)g2)->z , r->cf->algring));
 
     // second run: gcd's
@@ -592 +592 @@
     while ( (p != NULL) && (g != 1)  && ( g != 0))
     {
-      h = convSingPFactoryP( ((lnumber)pGetCoeff(p))->z, currRing->algring );
+      h = convSingPFactoryP( ((lnumber)pGetCoeff(p))->z, r->cf->algring );
       pIter( p );
 
@@ -610 +610 @@
       {
         lnumber c=(lnumber)pGetCoeff(p);
-        p_Delete(&c->z,currRing->algring); // 2nd arg used to be nacRing
-        c->z=convFactoryPSingP( i.getItem() / g, currRing->algring );
+        p_Delete(&c->z,r->cf->algring); // 2nd arg used to be nacRing
+        c->z=convFactoryPSingP( i.getItem() / g, r->cf->algring );
         //nTest((number)c);
         //#ifdef LDEBUG
@@ -624 +624 @@
 }
 
-BOOLEAN count_Factors(ideal I, intvec *v,int j, poly &f, poly fac)
-{
-  pTest(f);
-  pTest(fac);
+static int primepower(int c, const ring r)
+{
+  int p=1;
+  int cc=c;
+  while(cc!= rChar(r)) { cc*=c; p++; }
+  return p;
+}
+
+BOOLEAN count_Factors(ideal I, intvec *v,int j, poly &f, poly fac, const ring r)
+{
+  p_Test(f,r);
+  p_Test(fac,r);
   int e=0;
-  if (!pIsConstantPoly(fac))
+  if (!p_IsConstantPoly(fac,r))
   {
 #ifdef FACTORIZE2_DEBUG
@@ -638 +646 @@
     CanonicalForm F, FAC,Q,R;
     Variable a;
-    if (rField_is_Zp() || rField_is_Q())
-    {
-      F=convSingPFactoryP( f );
-      FAC=convSingPFactoryP( fac );
-    }
-    else if (rField_is_Extension())
-    {
-      if (currRing->minpoly!=NULL)
-      {
-        CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                    currRing->algring);
+    if (rField_is_Zp(r) || rField_is_Q(r))
+    {
+      F=convSingPFactoryP( f,r );
+      FAC=convSingPFactoryP( fac,r );
+    }
+    else if (rField_is_Extension(r))
+    {
+      if (r->cf->algring->minideal!=NULL)
+      {
+        CanonicalForm mipo=convSingPFactoryP(r->cf->algring->minideal->m[0],
+                                             r->cf->algring);
         a=rootOf(mipo);
-        F=convSingAPFactoryAP( f,a,currRing );
-        FAC=convSingAPFactoryAP( fac,a,currRing );
+        F=convSingAPFactoryAP( f,a,r );
+        FAC=convSingAPFactoryAP( fac,a,r );
       }
       else
       {
-        F=convSingTrPFactoryP( f );
-        FAC=convSingTrPFactoryP( fac );
+        F=convSingTrPFactoryP( f,r );
+        FAC=convSingTrPFactoryP( fac,r );
       }
     }
@@ -672 +680 @@
       if (R.isZero())
       {
-        if (rField_is_Zp() || rField_is_Q())
+        if (rField_is_Zp(r) || rField_is_Q(r))
         {
-          q = convFactoryPSingP( Q );
+          q = convFactoryPSingP( Q,r );
         }
-        else if (rField_is_Extension())
+        else if (rField_is_Extension(r))
         {
-          if (currRing->minpoly!=NULL)
+          if (r->cf->algring->minideal!=NULL)
           {
-            q= convFactoryAPSingAP(  Q,currRing  );
+            q= convFactoryAPSingAP(  Q,r  );
           }
           else
           {
-            q= convFactoryPSingTrP(  Q  );
+            q= convFactoryPSingTrP(  Q,r  );
           }
         }
-        e++; pDelete(&f); f=q; q=NULL; F=Q;
+        e++; p_Delete(&f,r); f=q; q=NULL; F=Q;
       }
       else
@@ -710 +718 @@
 extern int libfac_interruptflag;
 
-ideal singclap_factorize ( poly f, intvec ** v , int with_exps)
+ideal singclap_factorize ( poly f, intvec ** v , int with_exps, const ring r)
 /* destroys f, sets *v */
 {
-  pTest(f);
+  p_Test(f,r);
 #ifdef FACTORIZE2_DEBUG
   printf("singclap_factorize, degree %ld\n",pTotaldegree(f));
@@ -741 +749 @@
     int n=0;
     int e;
-    for(i=pVariables;i>0;i--) if(pGetExp(f,i)!=0) n++;
+    for(i=rVar(r);i>0;i--) if(p_GetExp(f,i,r)!=0) n++;
     if (with_exps==0) n++; // with coeff
     res=idInit(si_max(n,1),1);
@@ -747 +755 @@
     {
       case 0: // with coef & exp.
-        res->m[0]=pNSet(nCopy(pGetCoeff(f)));
+        res->m[0]=p_NSet(n_Copy(pGetCoeff(f),r->cf),r);
         // no break
       case 2: // with exp.
@@ -760 +768 @@
     if (n==0)
     {
-      res->m[0]=pOne();
+      res->m[0]=p_One(r);
       // (**v)[0]=1; is already done
     }
     else
     {
-      for(i=pVariables;i>0;i--)
-      {
-        e=pGetExp(f,i);
+      for(i=rVar(r);i>0;i--)
+      {
+        e=p_GetExp(f,i,r);
         if(e!=0)
         {
           n--;
-          poly p=pOne();
-          pSetExp(p,i,1);
-          pSetm(p);
+          poly p=p_One(r);
+          p_SetExp(p,i,1,r);
+          p_Setm(p,r);
           res->m[n]=p;
           if (with_exps!=1) (**v)[n]=e;
@@ -779 +787 @@
       }
     }
-    pDelete(&f);
+    p_Delete(&f,r);
     return res;
   }
@@ -788 +796 @@
   #ifdef HAVE_NTL
   extern int prime_number;
-  if(rField_is_Q()) prime_number=0;
+  if(rField_is_Q(r)) prime_number=0;
   #endif
   CFFList L;
   number N=NULL;
   number NN=NULL;
-  number old_lead_coeff=nCopy(pGetCoeff(f));
-
-  if (!rField_is_Zp() && !rField_is_Zp_a()) /* Q, Q(a) */
+  number old_lead_coeff=n_Copy(pGetCoeff(f), r->cf);
+
+  if (!rField_is_Zp(r) && !rField_is_Zp_a(r)) /* Q, Q(a) */
   {
     //if (f!=NULL) // already tested at start of routine
     {
-      number n0=nCopy(pGetCoeff(f));
+      number n0=n_Copy(pGetCoeff(f),r->cf);
       if (with_exps==0)
-        N=nCopy(n0);
-      p_Cleardenom(f, currRing);
-      NN=nDiv(n0,pGetCoeff(f));
-      nDelete(&n0);
+        N=n_Copy(n0,r->cf);
+      p_Cleardenom(f, r);
+      NN=n_Div(n0,pGetCoeff(f),r->cf);
+      n_Delete(&n0,r->cf);
       if (with_exps==0)
       {
-        nDelete(&N);
-        N=nCopy(NN);
-      }
-    }
-  }
-  else if (rField_is_Zp_a())
+        n_Delete(&N,r->cf);
+        N=n_Copy(NN,r->cf);
+      }
+    }
+  }
+  else if (rField_is_Zp_a(r))
   {
     //if (f!=NULL) // already tested at start of routine
     if (singclap_factorize_retry==0)
     {
-      number n0=nCopy(pGetCoeff(f));
+      number n0=n_Copy(pGetCoeff(f),r->cf);
       if (with_exps==0)
-        N=nCopy(n0);
-      pNorm(f);
-      p_Cleardenom(f, currRing);
-      NN=nDiv(n0,pGetCoeff(f));
-      nDelete(&n0);
+        N=n_Copy(n0,r->cf);
+      p_Norm(f,r);
+      p_Cleardenom(f, r);
+      NN=n_Div(n0,pGetCoeff(f),r->cf);
+      n_Delete(&n0,r->cf);
       if (with_exps==0)
       {
-        nDelete(&N);
-        N=nCopy(NN);
-      }
-    }
-  }
-  if (rField_is_Q() || rField_is_Zp())
-  {
-    setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPFactoryP( f ) );
+        n_Delete(&N,r->cf);
+        N=n_Copy(NN,r->cf);
+      }
+    }
+  }
+  if (rField_is_Q(r) || rField_is_Zp(r))
+  {
+    setCharacteristic( rChar(r) );
+    CanonicalForm F( convSingPFactoryP( f,r ) );
     L = factorize( F );
   }
@@ -854 +862 @@
   #endif
   // and over Q(a) / Fp(a)
-  else if (rField_is_Extension())
-  {
-    if (rField_is_Q_a()) setCharacteristic( 0 );
-    else                 setCharacteristic( -nGetChar() );
-    if (currRing->minpoly!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                   currRing->algring);
+  else if (rField_is_Extension(r))
+  {
+    if (rField_is_Q_a(r)) setCharacteristic( 0 );
+    else                 setCharacteristic( -rChar(r) );
+    if (r->cf->algring->minideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->algring->minideal->m[0],
+                                           r->cf->algring);
       Variable a=rootOf(mipo);
-      CanonicalForm F( convSingAPFactoryAP( f,a,currRing ) );
-      if (rField_is_Zp_a())
+      CanonicalForm F( convSingAPFactoryAP( f,a,r ) );
+      if (rField_is_Zp_a(r))
       {
         L = factorize( F, a );
@@ -876 +884 @@
     else
     {
-      CanonicalForm F( convSingTrPFactoryP( f ) );
+      CanonicalForm F( convSingTrPFactoryP( f,r ) );
       L = factorize( F );
     }
@@ -885 +893 @@
   }
   {
-    poly ff=pCopy(f); // a copy for the retry stuff
+    poly ff=p_Copy(f,r); // a copy for the retry stuff
     // the first factor should be a constant
     if ( ! L.getFirst().factor().inCoeffDomain() )
@@ -907 +915 @@
     {
       if (with_exps!=1) (**v)[j] = J.getItem().exp();
-      if (rField_is_Zp() || rField_is_Q())           /* Q, Fp */
+      if (rField_is_Zp(r) || rField_is_Q(r))           /* Q, Fp */
       {
         //count_Factors(res,*v,f, j, convFactoryPSingP( J.getItem().factor() );
-        res->m[j] = convFactoryPSingP( J.getItem().factor() );
+        res->m[j] = convFactoryPSingP( J.getItem().factor(),r );
       }
       #if 0
@@ -916 +924 @@
         res->m[j] = convFactoryGFSingGF( J.getItem().factor() );
       #endif
-      else if (rField_is_Extension())     /* Q(a), Fp(a) */
+      else if (rField_is_Extension(r))     /* Q(a), Fp(a) */
       {
         intvec *w=NULL;
         if (v!=NULL) w=*v;
-        if (currRing->minpoly==NULL)
+        if (r->cf->algring->minideal==NULL)
         {
-          if(!count_Factors(res,w,j,ff,convFactoryPSingTrP( J.getItem().factor() )))
+          if(!count_Factors(res,w,j,ff,convFactoryPSingTrP( J.getItem().factor(),r ),r))
           {
             if (w!=NULL)
               (*w)[j]=1;
-            res->m[j]=pOne();
+            res->m[j]=p_One(r);
           }
         }
         else
         {
-          if (!count_Factors(res,w,j,ff,convFactoryAPSingAP( J.getItem().factor(),currRing )))
+          if (!count_Factors(res,w,j,ff,convFactoryAPSingAP( J.getItem().factor(),r ),r))
           {
             if (w!=NULL)
               (*w)[j]=1;
-            res->m[j]=pOne();
+            res->m[j]=p_One(r);
           }
         }
       }
     }
-    if (rField_is_Extension() && (!pIsConstantPoly(ff)))
+    if (rField_is_Extension(r) && (!p_IsConstantPoly(ff,r)))
     {
       singclap_factorize_retry++;
@@ -950 +958 @@
         #endif
         intvec *ww=NULL;
-        idTest(res);
-        ideal h=singclap_factorize ( ff, &ww , with_exps);
-        idTest(h);
+        id_Test(res,r);
+        ideal h=singclap_factorize ( ff, &ww , with_exps, r );
+        id_Test(h,r);
         int l=(*v)->length();
         (*v)->resize(l+ww->length());
@@ -969 +977 @@
           h->m[jj]=NULL;
         }
-        idDelete(&res);
-        idDelete(&h);
+        id_Delete(&res,r);
+        id_Delete(&h,r);
         res=hh;
-        idTest(res);
+        id_Test(res,r);
         ff=NULL;
       }
@@ -982 +990 @@
         idShow(res);
         #endif
-        idDelete(&res);
+        id_Delete(&res,r);
         res=idInit(2,1);
-        res->m[0]=pOne();
+        res->m[0]=p_One(r);
         res->m[1]=ff; ff=NULL;
       }
     }
-    pDelete(&ff);
+    p_Delete(&ff,r);
     if (N!=NULL)
     {
-      pMult_nn(res->m[0],N);
-      nDelete(&N);
+      p_Mult_nn(res->m[0],N,r);
+      n_Delete(&N,r->cf);
       N=NULL;
     }
@@ -1004 +1012 @@
         if ((res->m[i]!=NULL)
         && (pNext(res->m[i])==NULL)
-        && (pIsConstant(res->m[i])))
+        && (p_IsConstant(res->m[i],r)))
         {
           if (with_exps!=0)
           {
-            pDelete(&(res->m[i]));
+            p_Delete(&(res->m[i]),r);
             if ((v!=NULL) && ((*v)!=NULL))
               (**v)[i]=0;
@@ -1017 +1025 @@
             while ((v!=NULL) && ((*v)!=NULL) && ((**v)[i]>1))
             {
-              res->m[0]=pMult(res->m[0],pCopy(res->m[i]));
+              res->m[0]=p_Mult_q(res->m[0],p_Copy(res->m[i],r),r);
               (**v)[i]--;
             }
-            res->m[0]=pMult(res->m[0],res->m[i]);
+            res->m[0]=p_Mult_q(res->m[0],res->m[i],r);
             res->m[i]=NULL;
             if ((v!=NULL) && ((*v)!=NULL))
@@ -1048 +1056 @@
       if (res->m[0]==NULL)
       {
-        res->m[0]=pOne();
-      }
-    }
-  }
-  if (rField_is_Q_a() && (currRing->minpoly!=NULL))
+        res->m[0]=p_One(r);
+      }
+    }
+  }
+  if (rField_is_Q_a(r) && (r->cf->algring->minideal!=NULL))
   {
     int i=IDELEMS(res)-1;
@@ -1059 +1067 @@
     for(;i>=stop;i--)
     {
-      pNorm(res->m[i]);
-    }
-    if (with_exps==0) pSetCoeff(res->m[0],old_lead_coeff);
-    else nDelete(&old_lead_coeff);
+      p_Norm(res->m[i],r);
+    }
+    if (with_exps==0) p_SetCoeff(res->m[0],old_lead_coeff,r);
+    else n_Delete(&old_lead_coeff,r->cf);
   }
   else
-    nDelete(&old_lead_coeff);
+    n_Delete(&old_lead_coeff,r->cf);
   errorreported=save_errorreported;
 notImpl:
@@ -1072 +1080 @@
   if (NN!=NULL)
   {
-    nDelete(&NN);
+    n_Delete(&NN,r->cf);
   }
   if (N!=NULL)
   {
-    nDelete(&N);
-  }
-  if (f!=NULL) pDelete(&f);
+    n_Delete(&N,r->cf);
+  }
+  if (f!=NULL) p_Delete(&f,r);
   //PrintS("......S\n");
   return res;
 }
-ideal singclap_sqrfree ( poly f)
-{
-  pTest(f);
+ideal singclap_sqrfree ( poly f, const ring r)
+{
+  p_Test(f,r);
 #ifdef FACTORIZE2_DEBUG
   printf("singclap_sqrfree, degree %d\n",pTotaldegree(f));
@@ -1107 +1115 @@
     int n=0;
     int e;
-    for(i=pVariables;i>0;i--) if(pGetExp(f,i)!=0) n++;
+    for(i=rVar(r);i>0;i--) if(p_GetExp(f,i,r)!=0) n++;
     n++; // with coeff
     res=idInit(si_max(n,1),1);
-    res->m[0]=pNSet(nCopy(pGetCoeff(f)));
+    res->m[0]=p_NSet(n_Copy(pGetCoeff(f),r->cf),r);
     if (n==0)
     {
-      res->m[0]=pOne();
+      res->m[0]=p_One(r);
       // (**v)[0]=1; is already done
       return res;
     }
-    for(i=pVariables;i>0;i--)
-    {
-      e=pGetExp(f,i);
+    for(i=rVar(r);i>0;i--)
+    {
+      e=p_GetExp(f,i,r);
       if(e!=0)
       {
         n--;
-        poly p=pOne();
-        pSetExp(p,i,1);
-        pSetm(p);
+        poly p=p_One(r);
+        p_SetExp(p,i,1,r);
+        p_Setm(p,r);
         res->m[n]=p;
       }
@@ -1137 +1145 @@
   #ifdef HAVE_NTL
   extern int prime_number;
-  if(rField_is_Q()) prime_number=0;
+  if(rField_is_Q(r)) prime_number=0;
   #endif
   CFFList L;
 
-  if (!rField_is_Zp() && !rField_is_Zp_a()) /* Q, Q(a) */
+  if (!rField_is_Zp(r) && !rField_is_Zp_a(r)) /* Q, Q(a) */
   {
     //if (f!=NULL) // already tested at start of routine
     {
-      p_Cleardenom(f, currRing);
-    }
-  }
-  else if (rField_is_Zp_a())
+      p_Cleardenom(f, r);
+    }
+  }
+  else if (rField_is_Zp_a(r))
   {
     //if (f!=NULL) // already tested at start of routine
     if (singclap_factorize_retry==0)
     {
-      pNorm(f);
-      p_Cleardenom(f, currRing);
-    }
-  }
-  if (rField_is_Q() || rField_is_Zp())
-  {
-    setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPFactoryP( f ) );
+      p_Norm(f,r);
+      p_Cleardenom(f, r);
+    }
+  }
+  if (rField_is_Q(r) || rField_is_Zp(r))
+  {
+    setCharacteristic( rChar(r) );
+    CanonicalForm F( convSingPFactoryP( f,r ) );
     L = sqrFree( F );
   }
@@ -1166 +1174 @@
   else if (rField_is_GF())
   {
-    int c=rChar(currRing);
+    int c=rChar(r);
     setCharacteristic( c, primepower(c) );
     CanonicalForm F( convSingGFFactoryGF( f ) );
@@ -1180 +1188 @@
   #endif
   // and over Q(a) / Fp(a)
-  else if (rField_is_Extension())
-  {
-    if (rField_is_Q_a()) setCharacteristic( 0 );
-    else                 setCharacteristic( -nGetChar() );
-    if (currRing->minpoly!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                    currRing->algring);
+  else if (rField_is_Extension(r))
+  {
+    if (rField_is_Q_a(r)) setCharacteristic( 0 );
+    else                 setCharacteristic( -rChar(r) );
+    if (r->cf->algring->minideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->algring->minideal->m[0],
+                                           r->cf->algring);
       Variable a=rootOf(mipo);
-      CanonicalForm F( convSingAPFactoryAP( f,a,currRing ) );
+      CanonicalForm F( convSingAPFactoryAP( f,a,r ) );
       CFFList SqrFreeMV( const CanonicalForm & f , const CanonicalForm & mipo=0) ;
 
@@ -1198 +1206 @@
     else
     {
-      CanonicalForm F( convSingTrPFactoryP( f ) );
+      CanonicalForm F( convSingTrPFactoryP( f,r ) );
       L = sqrFree( F );
     }
@@ -1215 +1223 @@
     for ( ; J.hasItem(); J++, j++ )
     {
-      if (rField_is_Zp() || rField_is_Q())           /* Q, Fp */
+      if (rField_is_Zp(r) || rField_is_Q(r))           /* Q, Fp */
         //count_Factors(res,*v,f, j, convFactoryPSingP( J.getItem().factor() );
-        res->m[j] = convFactoryPSingP( J.getItem().factor() );
+        res->m[j] = convFactoryPSingP( J.getItem().factor(),r );
       #if 0
       else if (rField_is_GF())
         res->m[j] = convFactoryGFSingGF( J.getItem().factor() );
       #endif
-      else if (rField_is_Extension())     /* Q(a), Fp(a) */
-      {
-        if (currRing->minpoly==NULL)
-          res->m[j]=convFactoryPSingTrP( J.getItem().factor() );
+      else if (rField_is_Extension(r))     /* Q(a), Fp(a) */
+      {
+        if (r->cf->algring->minideal==NULL)
+          res->m[j]=convFactoryPSingTrP( J.getItem().factor(),r );
         else
-          res->m[j]=convFactoryAPSingAP( J.getItem().factor(),currRing );
+          res->m[j]=convFactoryAPSingAP( J.getItem().factor(),r );
       }
     }
     if (res->m[0]==NULL)
     {
-      res->m[0]=pOne();
-    }
-  }
-  pDelete(&f);
+      res->m[0]=p_One(r);
+    }
+  }
+  p_Delete(&f,r);
   errorreported=save_errorreported;
 notImpl:
@@ -1242 +1250 @@
   return res;
 }
-matrix singclap_irrCharSeries ( ideal I)
+
+
+TODO(somebody, add libfac)
+/*matrix singclap_irrCharSeries ( ideal I, const ring r)
 {
   if (idIs0(I)) return mpNew(1,1);
@@ -1254 +1265 @@
   CFList L;
   ListCFList LL;
-  if (((nGetChar() == 0) || (nGetChar() > 1) )
-  && (currRing->parameter==NULL))
-  {
-    setCharacteristic( nGetChar() );
+  if (((rChar(r) == 0) || (rChar(r) > 1) )
+  && (rPar(r)==0))
+  {
+    setCharacteristic( rChar(r) );
     for(i=0;i<IDELEMS(I);i++)
     {
@@ -1263 +1274 @@
       if (p!=NULL)
       {
-        p=pCopy(p);
-        p_Cleardenom(p, currRing);
-        L.append(convSingPFactoryP(p));
+        p=p_Copy(p,r);
+        p_Cleardenom(p, r);
+        L.append(convSingPFactoryP(p,r));
       }
     }
   }
   // and over Q(a) / Fp(a)
-  else if (( nGetChar()==1 ) /* Q(a) */
-  || (nGetChar() <-1))       /* Fp(a) */
-  {
-    if (nGetChar()==1) setCharacteristic( 0 );
-    else               setCharacteristic( -nGetChar() );
+  else if (( rChar(r)==1 ) // Q(a)
+  || (rChar(r) <-1))       // Fp(a)
+  {
+    if (rChar(r)==1) setCharacteristic( 0 );
+    else               setCharacteristic( -rChar(r) );
     for(i=0;i<IDELEMS(I);i++)
     {
@@ -1280 +1291 @@
       if (p!=NULL)
       {
-        p=pCopy(p);
-        p_Cleardenom(p, currRing);
-        L.append(convSingTrPFactoryP(p));
+        p=p_Copy(p,r);
+        p_Cleardenom(p, r);
+        L.append(convSingTrPFactoryP(p,r));
       }
     }
@@ -1324 +1335 @@
     for (n=1, Li = LLi.getItem(); Li.hasItem(); Li++, n++)
     {
-      if ( (nGetChar() == 0) || (nGetChar() > 1) )
-        MATELEM(res,m,n)=convFactoryPSingP(Li.getItem());
+      if ( (rChar(r) == 0) || (rChar(r) > 1) )
+        MATELEM(res,m,n)=convFactoryPSingP(Li.getItem(),r);
       else
-        MATELEM(res,m,n)=convFactoryPSingTrP(Li.getItem());
+        MATELEM(res,m,n)=convFactoryPSingTrP(Li.getItem(),r);
     }
   }
   Off(SW_RATIONAL);
   return res;
-}
-
-char* singclap_neworder ( ideal I)
+}*/
+
+/*char* singclap_neworder ( ideal I, const ring r)
 {
   int i;
@@ -1340 +1351 @@
   On(SW_SYMMETRIC_FF);
   CFList L;
-  if (((nGetChar() == 0) || (nGetChar() > 1) )
-  && (currRing->parameter==NULL))
-  {
-    setCharacteristic( nGetChar() );
+  if (((rChar(r) == 0) || (rChar(r) > 1) )
+  && (rPar(r)==0))
+  {
+    setCharacteristic( rChar(r) );
     for(i=0;i<IDELEMS(I);i++)
     {
-      L.append(convSingPFactoryP(I->m[i]));
+      L.append(convSingPFactoryP(I->m[i],r));
     }
   }
   // and over Q(a) / Fp(a)
-  else if (( nGetChar()==1 ) /* Q(a) */
-  || (nGetChar() <-1))       /* Fp(a) */
-  {
-    if (nGetChar()==1) setCharacteristic( 0 );
-    else               setCharacteristic( -nGetChar() );
+  else if (( rChar(r)==1 ) // Q(a)
+  || (rChar(r) <-1))       // Fp(a)
+  {
+    if (rChar(r)==1) setCharacteristic( 0 );
+    else               setCharacteristic( -rChar(r) );
     for(i=0;i<IDELEMS(I);i++)
     {
-      L.append(convSingTrPFactoryP(I->m[i]));
+      L.append(convSingTrPFactoryP(I->m[i],r));
     }
   }
@@ -1370 +1381 @@
   StringSetS("");
   Li = IL;
-  int offs=rPar(currRing);
-  int* mark=(int*)omAlloc0((pVariables+offs)*sizeof(int));
-  int cnt=pVariables+offs;
+  int offs=rPar(r);
+  int* mark=(int*)omAlloc0((rVar(r)+offs)*sizeof(int));
+  int cnt=rVar(r)+offs;
   loop
   {
@@ -1382 +1393 @@
     {
       done=FALSE;
-      //StringAppendS(currRing->parameter[i]);
+      //StringAppendS(r->parameter[i]);
     }
     else
     {
-      StringAppendS(currRing->names[i-offs]);
+      StringAppendS(r->names[i-offs]);
     }
     Li++;
@@ -1393 +1404 @@
     if (done) StringAppendS(",");
   }
-  for(i=0;i<pVariables+offs;i++)
+  for(i=0;i<rVar(r)+offs;i++)
   {
     BOOLEAN done=TRUE;
@@ -1401 +1412 @@
       {
         done=FALSE;
-        //StringAppendS(currRing->parameter[i]);
+        //StringAppendS(r->parameter[i]);
       }
       else
       {
-        StringAppendS(currRing->names[i-offs]);
+        StringAppendS(r->names[i-offs]);
       }
       cnt--;
@@ -1415 +1426 @@
   if (s[strlen(s)-1]==',') s[strlen(s)-1]='\0';
   return s;
-}
-
-BOOLEAN singclap_isSqrFree(poly f)
+}*/
+
+BOOLEAN singclap_isSqrFree(poly f, const ring r)
 {
   BOOLEAN b=FALSE;
   Off(SW_RATIONAL);
   //  Q / Fp
-  if (((nGetChar() == 0) || (nGetChar() > 1) )
-  &&(currRing->parameter==NULL))
-  {
-    setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPFactoryP( f ) );
-    if((nGetChar()>1)&&(!F.isUnivariate()))
+  if (((rChar(r) == 0) || (rChar(r) > 1) )
+  &&(rPar(r)==0))
+  {
+    setCharacteristic( rChar(r) );
+    CanonicalForm F( convSingPFactoryP( f,r ) );
+    if((rChar(r)>1)&&(!F.isUnivariate()))
       goto err;
     b=(BOOLEAN)isSqrFree(F);
   }
   // and over Q(a) / Fp(a)
-  else if (( nGetChar()==1 ) /* Q(a) */
-  || (nGetChar() <-1))       /* Fp(a) */
-  {
-    if (nGetChar()==1) setCharacteristic( 0 );
-    else               setCharacteristic( -nGetChar() );
-    //if (currRing->minpoly!=NULL)
+  else if (( rChar(r)==1 ) /* Q(a) */
+  || (rChar(r) <-1))       /* Fp(a) */
+  {
+    if (rChar(r)==1) setCharacteristic( 0 );
+    else               setCharacteristic( -rChar(r) );
+    //if (r->minpoly!=NULL)
     //{
-    //  CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-    //                                             currRing->algring);
+    //  CanonicalForm mipo=convSingPFactoryP(((lnumber)r->minpoly)->z,
+    //                                             r->algring);
     //  Variable a=rootOf(mipo);
     //  CanonicalForm F( convSingAPFactoryAP( f,a ) );
@@ -1447 +1458 @@
     //else
     {
-      CanonicalForm F( convSingTrPFactoryP( f ) );
+      CanonicalForm F( convSingTrPFactoryP( f,r ) );
       b=(BOOLEAN)isSqrFree(F);
     }
@@ -1460 +1471 @@
 }
 
-poly singclap_det( const matrix m )
+poly singclap_det( const matrix m, const ring s )
 {
   int r=m->rows();
@@ -1469 +1480 @@
   }
   poly res=NULL;
-  if (( nGetChar() == 0 || nGetChar() > 1 )
-  && (currRing->parameter==NULL))
-  {
-    setCharacteristic( nGetChar() );
+  if (( s->cf->ch == 0 || s->cf->ch > 1 )
+  && (rPar(s)==0))
+  {
+    setCharacteristic( s->cf->ch );
     CFMatrix M(r,r);
     int i,j;
@@ -1479 +1490 @@
       for(j=r;j>0;j--)
       {
-        M(i,j)=convSingPFactoryP(MATELEM(m,i,j));
-      }
-    }
-    res= convFactoryPSingP( determinant(M,r) ) ;
+        M(i,j)=convSingPFactoryP(MATELEM(m,i,j),s);
+      }
+    }
+    res= convFactoryPSingP( determinant(M,r),s ) ;
   }
   // and over Q(a) / Fp(a)
-  else if (( nGetChar()==1 ) /* Q(a) */
-  || (nGetChar() <-1))       /* Fp(a) */
-  {
-    if (nGetChar()==1) setCharacteristic( 0 );
-    else               setCharacteristic( -nGetChar() );
+  else if (( s->cf->ch==1 ) /* Q(a) */
+  || (s->cf->ch <-1))       /* Fp(a) */
+  {
+    if (s->cf->ch==1) setCharacteristic( 0 );
+    else               setCharacteristic( -s->cf->ch );
     CFMatrix M(r,r);
     poly res;
-    if (currRing->minpoly!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                            currRing->algring);
+    if (rField_is_Extension(s)&& s->cf->algring->minideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(s->cf->algring->minideal->m[0],
+                                           s->cf->algring);
       Variable a=rootOf(mipo);
       int i,j;
@@ -1502 +1513 @@
         for(j=r;j>0;j--)
         {
-          M(i,j)=convSingAPFactoryAP(MATELEM(m,i,j),a,currRing);
+          M(i,j)=convSingAPFactoryAP(MATELEM(m,i,j),a,s);
         }
       }
-      res= convFactoryAPSingAP( determinant(M,r),currRing ) ;
+      res= convFactoryAPSingAP( determinant(M,r),s ) ;
     }
     else
@@ -1514 +1525 @@
         for(j=r;j>0;j--)
         {
-          M(i,j)=convSingTrPFactoryP(MATELEM(m,i,j));
+          M(i,j)=convSingTrPFactoryP(MATELEM(m,i,j),s);
         }
       }
-      res= convFactoryPSingTrP( determinant(M,r) );
+      res= convFactoryPSingTrP( determinant(M,r),s );
     }
   }
@@ -1526 +1537 @@
 }
 
-int singclap_det_i( intvec * m )
+int singclap_det_i( intvec * m)
 {
   setCharacteristic( 0 );
@@ -1538 +1549 @@
     }
   }
-  int res= convFactoryISingI( determinant(M,m->rows())) ;
+  int res= convFactoryISingI( determinant(M,m->rows()) ) ;
   Off(SW_RATIONAL);
   return res;
 }
 #ifdef HAVE_NTL
-matrix singntl_HNF(matrix  m )
+matrix singntl_HNF(matrix  m, const ring s )
 {
   int r=m->rows();
@@ -1552 +1563 @@
   }
   matrix res=mpNew(r,r);
-  if (rField_is_Q(currRing))
+  if (rField_is_Q(s))
   {
 
@@ -1561 +1572 @@
       for(j=r;j>0;j--)
       {
-        M(i,j)=convSingPFactoryP(MATELEM(m,i,j));
+        M(i,j)=convSingPFactoryP(MATELEM(m,i,j),s );
       }
     }
@@ -1569 +1580 @@
       for(j=r;j>0;j--)
       {
-        MATELEM(res,i,j)=convFactoryPSingP((*MM)(i,j));
+        MATELEM(res,i,j)=convFactoryPSingP((*MM)(i,j),s);
       }
     }
@@ -1576 +1587 @@
   return res;
 }
-intvec* singntl_HNF(intvec*  m )
+intvec* singntl_HNF(intvec*  m)
 {
   int r=m->rows();
@@ -1606 +1617 @@
   return mm;
 }
-matrix singntl_LLL(matrix  m )
+matrix singntl_LLL(matrix  m, const ring s )
 {
   int r=m->rows();
   int c=m->cols();
   matrix res=mpNew(r,c);
-  if (rField_is_Q(currRing))
+  if (rField_is_Q(s))
   {
     CFMatrix M(r,c);
@@ -1619 +1630 @@
       for(j=c;j>0;j--)
       {
-        M(i,j)=convSingPFactoryP(MATELEM(m,i,j));
+        M(i,j)=convSingPFactoryP(MATELEM(m,i,j),s);
       }
     }
@@ -1627 +1638 @@
       for(j=c;j>0;j--)
       {
-        MATELEM(res,i,j)=convFactoryPSingP((*MM)(i,j));
+        MATELEM(res,i,j)=convFactoryPSingP((*MM)(i,j),s);
       }
     }
@@ -1634 +1645 @@
   return res;
 }
-intvec* singntl_LLL(intvec*  m )
+intvec* singntl_LLL(intvec*  m)
 {
   int r=m->rows();

libpolys/polys/clapsing.h

@@ -21 +21 @@
 //#include <kernel/longtrans.h>
 
-poly singclap_gcd ( poly f, poly g );
+poly singclap_gcd ( poly f, poly g, const ring r );
 poly singclap_gcd_r ( poly f, poly g, const ring r );
 /*
@@ -28 +28 @@
 */
 
-poly singclap_resultant ( poly f, poly g , poly x);
+poly singclap_resultant ( poly f, poly g , poly x, const ring r);
 
-BOOLEAN singclap_extgcd ( poly f, poly g, poly &res, poly &pa, poly &pb );
+BOOLEAN singclap_extgcd ( poly f, poly g, poly &res, poly &pa, poly &pb , const ring r);
 BOOLEAN singclap_extgcd_r ( poly f, poly g, poly &res, poly &pa, poly &pb, const ring r );
 
-poly singclap_pdivide ( poly f, poly g );
+poly singclap_pdivide ( poly f, poly g, const ring r );
 poly singclap_pdivide_r ( poly f, poly g, const ring r );
 
-void singclap_divide_content ( poly f );
+void singclap_divide_content ( poly f, const ring r);
 
-ideal singclap_factorize ( poly f, intvec ** v , int with_exps);
+ideal singclap_factorize ( poly f, intvec ** v , int with_exps, const ring r);
 
-ideal singclap_sqrfree ( poly f );
+ideal singclap_sqrfree ( poly f, const ring r );
 
-matrix singclap_irrCharSeries ( ideal I);
+matrix singclap_irrCharSeries ( ideal I, const ring r);
 
 #ifdef HAVE_NTL
-matrix singntl_HNF(matrix A);
-intvec* singntl_HNF(intvec* A);
-matrix singntl_LLL(matrix A);
-intvec* singntl_LLL(intvec* A);
+matrix singntl_HNF(matrix A, const ring r);
+intvec* singntl_HNF(intvec* A, const ring r);
+matrix singntl_LLL(matrix A, const ring r);
+intvec* singntl_LLL(intvec* A, const ring r);
 #endif
 
-BOOLEAN singclap_isSqrFree(poly f);
+BOOLEAN singclap_isSqrFree(poly f, const ring r);
 
-char* singclap_neworder ( ideal I);
+char* singclap_neworder ( ideal I, const ring r);
 
-poly singclap_det( const matrix m );
-int singclap_det_i( intvec * m );
+poly singclap_det( const matrix m, const ring r );
+int singclap_det_i( intvec * m, const ring r );
 /*
 BOOLEAN jjRESULTANT(leftv res, leftv u, leftv v, leftv w);

libpolys/polys/monomials/p_polys.cc

@@ -1909 +1909 @@
     if ( (n_GetChar(r) == 1) || (n_GetChar(r) < 0) ) /* Q[a],Q(a),Zp[a],Z/p(a) */
     {
-      singclap_divide_content(ph);
+      singclap_divide_content(ph, r);
       if(!n_GreaterZero(pGetCoeff(ph),r->cf)) ph = p_Neg(ph,r);
     }