Changeset 46f6af6 in git

Timestamp:

Jan 7, 2008, 2:36:16 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

addc4c2c08713a1b97f0be5fda4a5d67a440eba9

Parents:

aa7480c120ef293aaf5a185ec38a2440c23fc879

Message:

*hannes: buckte for conversions


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

Location:

kernel

Files:

• clapconv.cc (modified) (43 diffs)
• clapconv.h (modified) (2 diffs)
• clapsing.cc (modified) (52 diffs)
• longalg.cc (modified) (3 diffs)
• longrat.cc (modified) (2 diffs)

kernel/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.9 2007-05-03 13:27:45 Singular Exp $
+// $Id: clapconv.cc,v 1.10 2008-01-07 13:36:16 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -21 +21 @@
 #include "febase.h"
 #include "ring.h"
+#include "sbuckets.h"
 
 static void convRec( const CanonicalForm & f, int * exp, poly & result );
@@ -26 +27 @@
 static void convRecAlg( const CanonicalForm & f, int * exp, napoly & result );
 
-static void convRecPP ( const CanonicalForm & f, int * exp, poly & result );
-static void conv_RecPP ( const CanonicalForm & f, int * exp, poly & result, ring r );
+static void conv_RecPP ( const CanonicalForm & f, int * exp, sBucket_pt result, ring r );
 
 static void convRecPTr ( const CanonicalForm & f, int * exp, napoly & result );
@@ -35 +35 @@
 static void convRecGFGF ( const CanonicalForm & f, int * exp, poly & result );
 
-static number convClapNSingAN( const CanonicalForm &f);
-
-CanonicalForm
-convSingNClapN( number n )
+static number convFactoryNSingAN( const CanonicalForm &f);
+
+CanonicalForm convSingNFactoryN( number n )
 {
   CanonicalForm term;
@@ -48 +47 @@
   else
   {
-    if ( ((long)n) & 1L )
-    {
-      term = ((long)n) >>2;
+    if ( SR_HDL(n) & SR_INT )
+    {
+      term = SR_TO_INT(n);
     }
     else
@@ -60 +59 @@
         term = make_cf( dummy );
       }
-      else  if ( n->s == 1 )
-      {
+      else
+      {
+        // assume s==0 or s==1
         MP_INT num, den;
         On(SW_RATIONAL);
         mpz_init_set( &num, &(n->z) );
         mpz_init_set( &den, &(n->n) );
-        term = make_cf( num, den, false );
-      }
-      else
-      { // assume s == 0
-        MP_INT num, den;
-        mpz_init_set( &num, &(n->z) );
-        mpz_init_set( &den, &(n->n) );
-        term = make_cf( num, den, true );
+        term = make_cf( num, den, ( n->s != 1 ));
       }
     }
@@ -80 +73 @@
 }
 
-number
-convClapNSingN( const CanonicalForm & n)
+number convFactoryNSingN( const CanonicalForm & n)
 {
   if (n.isImm())
@@ -92 +84 @@
 #endif
     z->z = gmp_numerator( n );
-    if ( n.den() == 1 )
+    if ( n.den().isOne() )
       z->s = 3;
     else
@@ -103 +95 @@
 }
 
-CanonicalForm conv_SingPClapP( poly p, ring r )
+CanonicalForm conv_SingPFactoryP( poly p, ring r )
 {
   CanonicalForm result = 0;
@@ -109 +101 @@
   assume( rPar(r)==0);
 
-  while ( p != NULL )
-  {
-    CanonicalForm term;
-    /* does only work for finite fields */
-    if ( getCharacteristic() != 0 )
-    {
-      term = npInt( pGetCoeff( p ) );
-    }
-    else
-    {
-      if ( (long)(pGetCoeff( p )) & 1 )
-      {
-        term = ((long)( pGetCoeff( p ) )>>2);
+  if ( getCharacteristic() != 0 )
+  {
+    /* does only work for finite fields Z/p*/
+    while ( p != NULL )
+    {
+      CanonicalForm term = npInt( pGetCoeff( p ) );
+      for ( int i = n; i >0; i-- )
+      {
+        if ( (e = p_GetExp( p, i, r )) != 0 )
+           term *= power( Variable( i ), e );
+      }
+      result += term;
+      pIter( p );
+    }
+  }
+  else
+  {
+    while ( p != NULL )
+    {
+      CanonicalForm term;
+      if ( SR_HDL(pGetCoeff( p )) & SR_INT )
+      {
+        term = SR_TO_INT( pGetCoeff( p ) );
       }
       else
@@ -131 +133 @@
           term = make_cf( dummy );
         }
-        else  if ( pGetCoeff( p )->s == 1 )
-        {
+        else
+        {
+          // assume s==1 or s==0
           MP_INT num, den;
           On(SW_RATIONAL);
           mpz_init_set( &num, &(pGetCoeff( p )->z) );
           mpz_init_set( &den, &(pGetCoeff( p )->n) );
-          term = make_cf( num, den, false );
-        }
-        else
-        { // assume s == 0
-          MP_INT num, den;
-          mpz_init_set( &num, &(pGetCoeff( p )->z) );
-          mpz_init_set( &den, &(pGetCoeff( p )->n) );
-          term = make_cf( num, den, true );
-        }
-      }
-    }
-    for ( int i = 1; i <= n; i++ )
-    {
-      if ( (e = p_GetExp( p, i, r )) != 0 )
-         term *= power( Variable( i ), e );
-    }
-    result += term;
-    p = pNext( p );
-  }
-  return result;
-}
-
-poly convClapPSingP ( const CanonicalForm & f )
-{
-//    cerr << " f = " << f << endl;
-  int n = pVariables+1;
-  /* ASSERT( level( f ) <= pVariables, "illegal number of variables" ); */
-  int * exp = new int[n];
-  //for ( int i = 0; i < n; i++ ) exp[i] = 0;
-  memset(exp,0,n*sizeof(int));
-  poly result = NULL;
-  convRecPP( f, exp, result );
-  delete [] exp;
-  return result;
-}
-
-static void convRecPP ( const CanonicalForm & f, int * exp, poly & result )
-{
-  if (f == 0)
-    return;
-  if ( ! f.inCoeffDomain() )
-  {
-    int l = f.level();
-    for ( CFIterator i = f; i.hasTerms(); i++ )
-    {
-      exp[l] = i.exp();
-      convRecPP( i.coeff(), exp, result );
-    }
-    exp[l] = 0;
-  }
-  else
-  {
-    poly term = pInit();
-    pNext( term ) = NULL;
-    for ( int i = 1; i <= pVariables; i++ )
-      pSetExp( term, i, exp[i]);
-    pSetComp(term, 0);
-    if ( getCharacteristic() != 0 )
-    {
-      pGetCoeff( term ) = nInit( f.intval() );
-    }
-    else
-    {
-      if ( f.isImm() )
-        pGetCoeff( term ) = nInit( f.intval() );
-      else
-      {
-        number z=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG)
-        z->debug=123456;
-#endif
-        z->z = gmp_numerator( f );
-        if ( f.den() == 1 )
-          z->s = 3;
-        else
-        {
-          z->n = gmp_denominator( f );
-          z->s = 0;
-        }
-        nlNormalize(z);
-        pGetCoeff( term ) = z;
-      }
-    }
-    pSetm( term );
-    if ( nIsZero(pGetCoeff(term)) )
-    {
-      pDelete(&term);
-    }
-    else
-    {
-      result = pAdd( result, term );
-    }
-  }
-}
-
-poly conv_ClapPSingP ( const CanonicalForm & f, ring r )
+          term = make_cf( num, den, ( pGetCoeff( p )->s != 1 ));
+        }
+      }
+      for ( int i = n; i >0; i-- )
+      {
+        if ( (e = p_GetExp( p, i, r )) != 0 )
+           term *= power( Variable( i ), e );
+      }
+      result += term;
+      pIter( p );
+    }
+  }
+  return result;
+}
+
+poly conv_FactoryPSingP ( const CanonicalForm & f, ring r )
 {
 //    cerr << " f = " << f << endl;
   int n = r->N+1;
   /* ASSERT( level( f ) <= pVariables, "illegal number of variables" ); */
-  int * exp = new int[n];
-  //for ( int i = 0; i < n; i++ ) exp[i] = 0;
-  memset(exp,0,n*sizeof(int));
-  poly result = NULL;
-  conv_RecPP( f, exp, result, r );
-  delete [] exp;
-  return result;
-}
-
-static void
-conv_RecPP ( const CanonicalForm & f, int * exp, poly & result, ring r )
-{
-  if (f == 0)
+  int * exp = (int*)omAlloc0(n*sizeof(int));
+  sBucket_pt result_bucket=sBucketCreate(r);
+  conv_RecPP( f, exp, result_bucket, r );
+  poly result; int dummy;
+  sBucketDestroyMerge(result_bucket,&result,&dummy);
+  omFreeSize((ADDRESS)exp,n*sizeof(int));
+  return result;
+}
+
+static void conv_RecPP ( const CanonicalForm & f, int * exp, sBucket_pt result, ring r )
+{
+  if (f.isZero())
     return;
   if ( ! f.inCoeffDomain() )
@@ -268 +190 @@
       p_SetExp( term, i, exp[i], r);
     if (rRing_has_Comp(r)) p_SetComp(term, 0, r);
-    if ( getCharacteristic() != 0 )
-    {
+    if ( f.isImm() )
       pGetCoeff( term ) = n_Init( f.intval(), r );
-    }
-    else
-    {
-      if ( f.isImm() )
-        pGetCoeff( term ) = n_Init( f.intval(), r );
+    else
+    {
+      number z=(number)omAllocBin(rnumber_bin);
+#if defined(LDEBUG)
+      z->debug=123456;
+#endif
+      z->z = gmp_numerator( f );
+      if ( f.den().isOne() )
+        z->s = 3;
       else
       {
-        number z=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG)
-        z->debug=123456;
-#endif
-        z->z = gmp_numerator( f );
-        if ( f.den() == 1 )
-          z->s = 3;
-        else
-        {
-          z->n = gmp_denominator( f );
-          z->s = 0;
-        }
-        pGetCoeff( term ) = z;
+        z->n = gmp_denominator( f );
+        z->s = 0;
         nlNormalize(z);
       }
+      pGetCoeff( term ) = z;
     }
     p_Setm( term, r );
@@ -301 +216 @@
     else
     {
-      result = p_Add_q( result, term, r );
-    }
-  }
-}
-
-
-CanonicalForm
-convSingTrClapP( napoly p )
+      sBucket_Merge_p(result,term,1);
+    }
+  }
+}
+
+
+CanonicalForm convSingTrFactoryP( napoly p )
 {
   CanonicalForm result = 0;
@@ -323 +237 @@
     else
     {
-      //if ( (!(int)(napGetCoeff( p )) & 1 )
-      //&&  ( napGetCoeff( p )->s == 0))
-      //  naNormalize( naGetCoeff( p ) );
-      if ( (long)(napGetCoeff( p )) & 1L )
-        term = nlInt( napGetCoeff( p ) );
+      if ( SR_HDL(napGetCoeff( p )) & SR_INT )
+        term = SR_TO_INT( napGetCoeff( p ) );
       else
       {
@@ -336 +247 @@
           term = make_cf( dummy );
         }
-        else  if ( napGetCoeff( p )->s == 1 )
-        {
+        else
+        {
+          // assume s==0 or s==1
           MP_INT num, den;
           On(SW_RATIONAL);
           mpz_init_set( &num, &(napGetCoeff( p )->z) );
           mpz_init_set( &den, &(napGetCoeff( p )->n) );
-          term = make_cf( num, den, false );
-        }
-        else
-        { // assume s == 0
-          MP_INT num, den;
-          On(SW_RATIONAL);
-          mpz_init_set( &num, &(napGetCoeff( p )->z) );
-          mpz_init_set( &den, &(napGetCoeff( p )->n) );
-          term = make_cf( num, den, true );
-        }
-      }
-    }
-    for ( int i = 1; i <= n; i++ )
+          term = make_cf( num, den, ( napGetCoeff( p )->s != 1 ));
+        }
+      }
+    }
+    for ( int i = n; i >0; i-- )
     {
       if ( (e = napGetExp( p, i )) != 0 )
@@ -365 +269 @@
 }
 
-napoly
-convClapPSingTr ( const CanonicalForm & f )
+napoly convFactoryPSingTr ( const CanonicalForm & f )
 {
 //    cerr << " f = " << f << endl;
   int n = napVariables+1;
   /* ASSERT( level( f ) <= napVariables, "illegal number of variables" ); */
-  int * exp = new int[n];
-  // for ( int i = 0; i < n; i++ ) exp[i] = 0;
-  memset(exp,0,n*sizeof(int));
+  int * exp = (int *)omAlloc0(n*sizeof(int));
   napoly result = NULL;
   convRecPTr( f, exp, result );
-  delete [] exp;
-  return result;
-}
-
-static void
-convRecPTr ( const CanonicalForm & f, int * exp, napoly & result )
-{
-  if (f == 0)
+  omFreeSize((ADDRESS)exp,n*sizeof(int));
+  return result;
+}
+
+static void convRecPTr ( const CanonicalForm & f, int * exp, napoly & result )
+{
+  if (f.isZero())
     return;
   if ( ! f.inCoeffDomain() )
@@ -401 +301 @@
     for ( int i = 1; i <= napVariables; i++ )
       napSetExp( term, i , exp[i]);
-    if ( getCharacteristic() != 0 )
-    {
-      napGetCoeff( term ) = npInit( f.intval() );
-    }
-    else
-    {
-      if ( f.isImm() )
-        napGetCoeff( term ) = nlInit( f.intval() );
+    if ( f.isImm() )
+      napGetCoeff( term ) = nacInit( f.intval() );
+    else
+    {
+      number z=(number)omAllocBin(rnumber_bin);
+#if defined(LDEBUG)
+      z->debug=123456;
+#endif
+      z->z = gmp_numerator( f );
+      if ( f.den().isOne() )
+      {
+        z->s = 3;
+      }
       else
       {
-        number z=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG)
-        z->debug=123456;
-#endif
-        z->z = gmp_numerator( f );
-        if ( f.den() == 1 )
-        {
-          z->s = 3;
+        z->n = gmp_denominator( f );
+        if (mpz_cmp_si(&z->n,(long)1)==0)
+        {
+          mpz_clear(&z->n);
+          z->s=3;
         }
         else
         {
-          z->n = gmp_denominator( f );
-          if (mpz_cmp_si(&z->n,(long)1)==0)
-          {
-            mpz_clear(&z->n);
-            z->s=3;
-          }
-          else
-          {
-            z->s = 0;
-          }
+          z->s = 0;
           nacNormalize(z);
         }
-        napGetCoeff( term ) = z;
-      }
+      }
+      napGetCoeff( term ) = z;
     }
     if (nacIsZero(pGetCoeff(term)))
@@ -448 +341 @@
 }
 
-CanonicalForm convSingAPClapAP ( poly p , const Variable & a)
+CanonicalForm convSingAPFactoryAP ( poly p , const Variable & a)
 {
   CanonicalForm result = 0;
@@ -457 +350 @@
   while ( p!=NULL)
   {
-    CanonicalForm term=convSingAClapA(((lnumber)pGetCoeff(p))->z,a);
+    CanonicalForm term=convSingAFactoryA(((lnumber)pGetCoeff(p))->z,a);
     for ( int i = 1; i <= n; i++ )
     {
@@ -464 +357 @@
     }
     result += term;
-    p = pNext( p );
+    pIter( p );
   }
   return result;
@@ -472 +365 @@
 convRecAP_R ( const CanonicalForm & f, int * exp, poly & result, int par_start, int var_start) ;
 
-poly convClapAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start )
+poly convFactoryAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start )
 {
   int n = pVariables+1+rPar(currRing);
-  int * exp = new int[n];
-  // for ( int i = 0; i < n; i++ ) exp[i] = 0;
-  memset(exp,0,n*sizeof(int));
+  int * exp = (int *)omAlloc0(n*sizeof(int));
   poly result = NULL;
   convRecAP_R( f, exp, result,par_start, var_start );
-  delete [] exp;
-  return result;
-}
-poly convClapAPSingAP ( const CanonicalForm & f )
-{
-  return convClapAPSingAP_R(f,0,rPar(currRing));
-}
-
-static void
-convRecAP_R ( const CanonicalForm & f, int * exp, poly & result, int par_start, int var_start )
-{
-  if (f == 0)
+  omFreeSize((ADDRESS)exp,n*sizeof(int));
+  return result;
+}
+
+poly convFactoryAPSingAP ( const CanonicalForm & f )
+{
+  return convFactoryAPSingAP_R(f,0,rPar(currRing));
+}
+
+static void convRecAP_R ( const CanonicalForm & f, int * exp, poly & result, int par_start, int var_start )
+{
+  if (f.isZero())
     return;
   if ( ! f.inCoeffDomain() )
@@ -505 +396 @@
   else
   {
-    napoly z=(napoly)convClapASingA( f );
+    napoly z=(napoly)convFactoryASingA( f );
     if (z!=NULL)
     {
@@ -513 +404 @@
       for ( i = 1; i <= pVariables; i++ )
         pSetExp( term, i , exp[i+var_start]);
-      pSetComp(term, 0);
+      if (rRing_has_Comp(currRing->algring))
+        p_SetComp(term, 0, currRing->algring);
       if (par_start==0)
       {
@@ -534 +426 @@
 }
 
-CanonicalForm convSingAClapA ( napoly p , const Variable & a )
+CanonicalForm convSingAFactoryA ( napoly p , const Variable & a )
 {
   CanonicalForm result = 0;
@@ -549 +441 @@
     else
     {
-      //if ( (!(int)(napGetCoeff( p )) & 1 )
-      //&&  ( napGetCoeff( p )->s == 0))
-      //  naNormalize( naGetCoeff( p ) );
-      if ( (long)(napGetCoeff( p )) & SR_INT )
-        term = nlInt( napGetCoeff( p ) );
-        //term = SR_TO_INT(napGetCoeff( p )) ;
+      if ( SR_HDL(napGetCoeff( p )) & SR_INT )
+        term = SR_TO_INT(napGetCoeff( p )) ;
       else
       {
@@ -563 +451 @@
           term = make_cf( dummy );
         }
-        else  if ( napGetCoeff( p )->s == 1 )
-        {
+        else
+        {
+          // assume s==0 or s==1
           MP_INT num, den;
           On(SW_RATIONAL);
           mpz_init_set( &num, &(napGetCoeff( p )->z) );
           mpz_init_set( &den, &(napGetCoeff( p )->n) );
-          term = make_cf( num, den, false );
-        }
-        else
-        { // assume s == 0
-          MP_INT num, den;
-          On(SW_RATIONAL);
-          mpz_init_set( &num, &(napGetCoeff( p )->z) );
-          mpz_init_set( &den, &(napGetCoeff( p )->n) );
-          term = make_cf( num, den, true );
+          term = make_cf( num, den, ( napGetCoeff( p )->s != 1 ));
         }
       }
@@ -589 +470 @@
 }
 
-static number convClapNSingAN( const CanonicalForm &f)
-{
-  if ((getCharacteristic() != 0) || ( f.isImm() ))
+static number convFactoryNSingAN( const CanonicalForm &f)
+{
+  if ( f.isImm() )
     return nacInit( f.intval() );
   else
@@ -600 +481 @@
 #endif
     z->z = gmp_numerator( f );
-    if ( f.den() == 1 )
+    if ( f.den().isOne() )
     {
       z->s = 3;
@@ -608 +489 @@
       z->n = gmp_denominator( f );
       z->s = 0;
-    }
-    nlNormalize(z);
+      nlNormalize(z);
+    }
     #ifdef LDEBUG
     nlDBTest(z,__FILE__,__LINE__);
@@ -617 +498 @@
 }
 
-napoly convClapASingA ( const CanonicalForm & f )
+napoly convFactoryASingA ( const CanonicalForm & f )
 {
   napoly a=NULL;
@@ -625 +506 @@
     t=napNew();
     // napNext( t ) = NULL; //already done by napNew
-    napGetCoeff(t)=convClapNSingAN( i.coeff() );
+    napGetCoeff(t)=convFactoryNSingAN( i.coeff() );
     if (nacIsZero(napGetCoeff(t)))
     {
@@ -647 +528 @@
 }
 
-CanonicalForm convSingTrPClapP ( poly p )
+CanonicalForm convSingTrPFactoryP ( poly p )
 {
   CanonicalForm result = 0;
@@ -656 +537 @@
   {
     nNormalize(pGetCoeff(p));
-    CanonicalForm term=convSingTrClapP(((lnumber)pGetCoeff(p))->z);
+    CanonicalForm term=convSingTrFactoryP(((lnumber)pGetCoeff(p))->z);
 
     if ((((lnumber)pGetCoeff(p))->n!=NULL)
@@ -664 +545 @@
     }
 
-    for ( int i = 1; i <= n; i++ )
+    for ( int i = n; i > 0; i-- )
     {
       if ( (e = pGetExp( p, i )) != 0 )
@@ -675 +556 @@
 }
 
-poly convClapPSingTrP ( const CanonicalForm & f )
+poly convFactoryPSingTrP ( const CanonicalForm & f )
 {
   int n = pVariables+1;
-  int * exp = new int[n];
-  // for ( int i = 0; i < n; i++ ) exp[i] = 0;
-  memset(exp,0,n*sizeof(int));
+  int * exp = (int*)omAlloc0(n*sizeof(int));
   poly result = NULL;
   convRecTrP( f, exp, result , rPar(currRing) );
-  delete [] exp;
+  omFreeSize((ADDRESS)exp,n*sizeof(int));
   return result;
 }
@@ -690 +569 @@
 convRecTrP ( const CanonicalForm & f, int * exp, poly & result , int offs)
 {
-  if (f == 0)
+  if (f.isZero())
     return;
   if ( f.level() > offs )
@@ -708 +587 @@
     for ( int i = 1; i <= pVariables; i++ )
       pSetExp( term, i ,exp[i]);
-    pSetComp(term, 0);
+    if (rRing_has_Comp(currRing))
+        p_SetComp(term, 0, currRing);
     pGetCoeff(term)=(number)omAlloc0Bin(rnumber_bin);
-    ((lnumber)pGetCoeff(term))->z=convClapPSingTr( f );
+    ((lnumber)pGetCoeff(term))->z=convFactoryPSingTr( f );
     pSetm( term );
     result = pAdd( result, term );
@@ -729 +609 @@
   CanonicalForm xnew,qnew;
   chineseRemainder(X,Q,xnew,qnew);
-  number n=convClapNSingN(xnew);
-  number p=convClapNSingN(qnew);
+  number n=convFactoryNSingN(xnew);
+  number p=convFactoryNSingN(qnew);
   number p2=nlIntDiv(p,nlInit(2));
   if (nlGreater(n,p2))
@@ -749 +629 @@
 #if 0
 CanonicalForm
-convSingGFClapGF( poly p )
+convSingGFFactoryGF( poly p )
 {
   CanonicalForm result = 0;
@@ -770 +650 @@
 
 poly
-convClapGFSingGF ( const CanonicalForm & f )
+convFactoryGFSingGF ( const CanonicalForm & f )
 {
 //    cerr << " f = " << f << endl;
   int n = pVariables+1;
   /* ASSERT( level( f ) <= pVariables, "illegal number of variables" ); */
-  int * exp = new int[n];
-  //for ( int i = 0; i < n; i++ ) exp[i] = 0;
-  memset(exp,0,n*sizeof(int));
+  int * exp = (int*)omAlloc0(n*sizeof(int));
   poly result = NULL;
   convRecGFGF( f, exp, result );
-  delete [] exp;
+  omFreeSize((ADDRESS)exp,n*sizeof(int));
   return result;
 }
@@ -787 +665 @@
 convRecGFGF ( const CanonicalForm & f, int * exp, poly & result )
 {
-  if (f == 0)
+  if (f.isZero())
     return;
   if ( ! f.inCoeffDomain() )
@@ -805 +683 @@
     for ( int i = 1; i <= pVariables; i++ )
       pSetExp( term, i, exp[i]);
-    pSetComp(term, 0);
+    if (rRing_has_Comp(currRing))
+        p_SetComp(term, 0, currRing);
     pGetCoeff( term ) = (number) gf_value (f);
     pSetm( term );
@@ -813 +692 @@
 #endif
 
-int convClapISingI( const CanonicalForm & f)
+int convFactoryISingI( const CanonicalForm & f)
 {
   if (!f.isImm()) WerrorS("int overflow in det");

kernel/clapconv.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.h,v 1.2 2005-06-13 16:23:30 Singular Exp $
+// $Id: clapconv.h,v 1.3 2008-01-07 13:36:16 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -16 +16 @@
 #include <factory.h>
 
-napoly convClapPSingTr ( const CanonicalForm & f );
-CanonicalForm convSingTrClapP( napoly p );
+napoly convFactoryPSingTr ( const CanonicalForm & f );
+CanonicalForm convSingTrFactoryP( napoly p );
 
-poly convClapPSingP ( const CanonicalForm & f );
-#define  convSingPClapP(p) conv_SingPClapP(p,currRing)
+#define  convSingPFactoryP(p) conv_SingPFactoryP(p,currRing)
 
-poly conv_ClapPSingP ( const CanonicalForm & f, ring r );
-CanonicalForm conv_SingPClapP( poly p, ring r );
+poly conv_FactoryPSingP ( const CanonicalForm & f, ring r );
+CanonicalForm conv_SingPFactoryP( poly p, ring r );
 
-CanonicalForm convSingAPClapAP ( poly p , const Variable & a );
-poly convClapAPSingAP ( const CanonicalForm & f );
-poly convClapAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start );
+#define  convFactoryPSingP(p) conv_FactoryPSingP(p,currRing)
 
-CanonicalForm convSingGFClapGF ( poly p );
-poly convClapGFSingGF ( const CanonicalForm & f );
+CanonicalForm convSingAPFactoryAP ( poly p , const Variable & a );
+poly convFactoryAPSingAP ( const CanonicalForm & f );
+poly convFactoryAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start );
 
-CanonicalForm convSingAClapA ( napoly p , const Variable & a );
-napoly convClapASingA ( const CanonicalForm & f );
+CanonicalForm convSingGFFactoryGF ( poly p );
+poly convFactoryGFSingGF ( const CanonicalForm & f );
 
-CanonicalForm convSingTrPClapP ( poly p );
-poly convClapPSingTrP ( const CanonicalForm & f );
+CanonicalForm convSingAFactoryA ( napoly p , const Variable & a );
+napoly convFactoryASingA ( const CanonicalForm & f );
 
-CanonicalForm convSingNClapN( number n );
-number convClapNSingN( const CanonicalForm & n);
+CanonicalForm convSingTrPFactoryP ( poly p );
+poly convFactoryPSingTrP ( const CanonicalForm & f );
+
+CanonicalForm convSingNFactoryN( number n );
+number convFactoryNSingN( const CanonicalForm & n);
 
 
-// CanonicalForm convSingIClapI( int i);a <- by constructor of CanonicalForm
-int convClapISingI( const CanonicalForm & f);
+// CanonicalForm convSingIFactoryI( int i);a <- by constructor of CanonicalForm
+int convFactoryISingI( const CanonicalForm & f);
 #endif /* INCL_SINGCONV_H */

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.23 2007-11-07 17:11:53 Singular Exp $
+// $Id: clapsing.cc,v 1.24 2008-01-07 13:36:16 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -138 +138 @@
 #define FACTORY_CFTROUT_POLY( tag, f ) \
   { \
-    napoly F=convClapPSingTr( f ); \
+    napoly F=convFactoryPSingTr( f ); \
     StringSetS( tag ); \
     napWrite( F ); \
@@ -147 +147 @@
 #define FACTORY_CFAOUT_POLY( tag, f ) \
   { \
-    napoly F=convClapASingA( f ); \
+    napoly F=convFactoryASingA( f ); \
     StringSetS( tag ); \
     napWrite( F ); \
@@ -164 +164 @@
   if (currRing->minpoly!=NULL) \
   { \
-    CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z); \
+    CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z); \
     Variable a=rootOf(mipo); \
-    printPolyPattern( tag, convSingAClapA( f,a ), rPar( currRing ) ); \
+    printPolyPattern( tag, convSingAFactoryA( f,a ), rPar( currRing ) ); \
   } \
   else \
   { \
-    printPolyPattern( tag, convSingTrClapP( f ), rPar( currRing ) ); \
+    printPolyPattern( tag, convSingTrFactoryP( f ), rPar( currRing ) ); \
   }
 // CanonicalForm f, represents transcendent extension
@@ -216 +216 @@
     CanonicalForm newGCD(const CanonicalForm & A, const CanonicalForm & B);
     setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPClapP( f ) ), G( convSingPClapP( g ) );
+    CanonicalForm F( convSingPFactoryP( f ) ), G( convSingPFactoryP( g ) );
     //if (nGetChar() > 1 )
     //{
-    //  res=convClapPSingP( newGCD( F,G ));
+    //  res=convFactoryPSingP( newGCD( F,G ));
     //  if (!nGreaterZero(pGetCoeff(res))) res=pNeg(res);
     //}
     //else
-      res=convClapPSingP( gcd( F, G ) );
+      res=convFactoryPSingP( gcd( F, G ) );
   }
   // and over Q(a) / Fp(a)
@@ -237 +237 @@
       {
       //  WerrorS( feNotImplemented );
-        CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+        CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
         //Varlist ord;
         //ord.append(mipo.mvar());
         CFList as(mipo);
         Variable a=rootOf(mipo);
-        //CanonicalForm F( convSingAPClapAP( f,a ) ), G( convSingAPClapAP( g,a ) );
-        CanonicalForm F( convSingTrPClapP(f) ), G( convSingTrPClapP(g) );
-        //res= convClapAPSingAP( algcd( F, G, as, ord) );
-        //res= convClapAPSingAP( alg_gcd( F, G, as) );
-        res= convClapAPSingAP( alg_gcd( F, G, as) );
+        //CanonicalForm F( convSingAPFactoryAP( f,a ) ), G( convSingAPFactoryAP( g,a ) );
+        CanonicalForm F( convSingTrPFactoryP(f) ), G( convSingTrPFactoryP(g) );
+        //res= convFactoryAPSingAP( algcd( F, G, as, ord) );
+        //res= convFactoryAPSingAP( alg_gcd( F, G, as) );
+        res= convFactoryAPSingAP( alg_gcd( F, G, as) );
       }
       else
       #endif
       {
-        CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+        CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
         Variable a=rootOf(mipo);
-        CanonicalForm F( convSingAPClapAP( f,a ) ), G( convSingAPClapAP( g,a ) );
-        res= convClapAPSingAP( gcd( F, G ) );
+        CanonicalForm F( convSingAPFactoryAP( f,a ) ), G( convSingAPFactoryAP( g,a ) );
+        res= convFactoryAPSingAP( gcd( F, G ) );
       }
     }
     else
     {
-      CanonicalForm F( convSingTrPClapP( f ) ), G( convSingTrPClapP( g ) );
-      res= convClapPSingTrP( gcd( F, G ) );
+      CanonicalForm F( convSingTrPFactoryP( f ) ), G( convSingTrPFactoryP( g ) );
+      res= convFactoryPSingTrP( gcd( F, G ) );
     }
   }
@@ -271 +271 @@
     while (t!=nChar) { t*=p;n++; }
     setCharacteristic(p,n,'a');
-    CanonicalForm F( convSingGFClapGF( f ) ), G( convSingGFClapGF( g ) );
-    res= convClapGFSingGF( gcd( F, G ) );
+    CanonicalForm F( convSingGFFactoryGF( f ) ), G( convSingGFFactoryGF( g ) );
+    res= convFactoryGFSingGF( gcd( F, G ) );
   }
   #endif
@@ -316 +316 @@
     Variable X(i);
     setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPClapP( f ) ), G( convSingPClapP( g ) );
-    poly res=convClapPSingP( resultant( F, G, X ) );
+    CanonicalForm F( convSingPFactoryP( f ) ), G( convSingPFactoryP( g ) );
+    poly res=convFactoryPSingP( resultant( F, G, X ) );
     Off(SW_RATIONAL);
     return res;
@@ -332 +332 @@
     {
       //Variable X(i);
-      CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+      CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
       Variable a=rootOf(mipo);
-      CanonicalForm F( convSingAPClapAP( f,a ) ), G( convSingAPClapAP( g,a ) );
-      res= convClapAPSingAP( resultant( F, G, X ) );
+      CanonicalForm F( convSingAPFactoryAP( f,a ) ), G( convSingAPFactoryAP( g,a ) );
+      res= convFactoryAPSingAP( resultant( F, G, X ) );
     }
     else
@@ -345 +345 @@
       ef=pGetExp_Var(f,i);
       eg=pGetExp_Var(g,i);
-      CanonicalForm F( convSingTrPClapP( f ) ), G( convSingTrPClapP( g ) );
-      res= convClapPSingTrP( resultant( F, G, X ) );
+      CanonicalForm F( convSingTrPFactoryP( f ) ), G( convSingTrPFactoryP( g ) );
+      res= convFactoryPSingTrP( resultant( F, G, X ) );
       if ((nf!=NULL)&&(!nIsOne(nf))&&(!nIsZero(nf)))
       {
@@ -448 +448 @@
   {
     setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPClapP( f ) ), G( convSingPClapP( g ) );
+    CanonicalForm F( convSingPFactoryP( f ) ), G( convSingPFactoryP( g ) );
     CanonicalForm FpG=F+G;
     if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
@@ -459 +459 @@
     CanonicalForm Fa,Gb;
     On(SW_RATIONAL);
-    res=convClapPSingP( extgcd( F, G, Fa, Gb ) );
-    pa=convClapPSingP(Fa);
-    pb=convClapPSingP(Gb);
+    res=convFactoryPSingP( extgcd( F, G, Fa, Gb ) );
+    pa=convFactoryPSingP(Fa);
+    pb=convFactoryPSingP(Gb);
     Off(SW_RATIONAL);
   }
@@ -473 +473 @@
     if (currRing->minpoly!=NULL)
     {
-      CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+      CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
       Variable a=rootOf(mipo);
-      CanonicalForm F( convSingAPClapAP( f,a ) ), G( convSingAPClapAP( g,a ) );
+      CanonicalForm F( convSingAPFactoryAP( f,a ) ), G( convSingAPFactoryAP( g,a ) );
       CanonicalForm FpG=F+G;
       if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
@@ -483 +483 @@
         return TRUE;
       }
-      res= convClapAPSingAP( extgcd( F, G, Fa, Gb ) );
-      pa=convClapAPSingAP(Fa);
-      pb=convClapAPSingAP(Gb);
+      res= convFactoryAPSingAP( extgcd( F, G, Fa, Gb ) );
+      pa=convFactoryAPSingAP(Fa);
+      pb=convFactoryAPSingAP(Gb);
     }
     else
     {
-      CanonicalForm F( convSingTrPClapP( f ) ), G( convSingTrPClapP( g ) );
+      CanonicalForm F( convSingTrPFactoryP( f ) ), G( convSingTrPFactoryP( g ) );
       CanonicalForm FpG=F+G;
       if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
@@ -498 +498 @@
         return TRUE;
       }
-      res= convClapPSingTrP( extgcd( F, G, Fa, Gb ) );
-      pa=convClapPSingTrP(Fa);
-      pb=convClapPSingTrP(Gb);
+      res= convFactoryPSingTrP( extgcd( F, G, Fa, Gb ) );
+      pa=convFactoryPSingTrP(Fa);
+      pb=convFactoryPSingTrP(Gb);
     }
     Off(SW_RATIONAL);
@@ -522 +522 @@
   {
     setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPClapP( f ) ), G( convSingPClapP( g ) );
-    res = convClapPSingP( F / G );
+    CanonicalForm F( convSingPFactoryP( f ) ), G( convSingPFactoryP( g ) );
+    res = convFactoryPSingP( F / G );
   }
   // and over Q(a) / Fp(a)
@@ -533 +533 @@
     if (currRing->minpoly!=NULL)
     {
-      CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+      CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
       Variable a=rootOf(mipo);
-      CanonicalForm F( convSingAPClapAP( f,a ) ), G( convSingAPClapAP( g,a ) );
-      res= convClapAPSingAP(  F / G  );
+      CanonicalForm F( convSingAPFactoryAP( f,a ) ), G( convSingAPFactoryAP( g,a ) );
+      res= convFactoryAPSingAP(  F / G  );
     }
     else
     {
-      CanonicalForm F( convSingTrPClapP( f ) ), G( convSingTrPClapP( g ) );
-      res= convClapPSingTrP(  F / G  );
+      CanonicalForm F( convSingTrPFactoryP( f ) ), G( convSingTrPFactoryP( g ) );
+      res= convFactoryPSingTrP(  F / G  );
     }
   }
@@ -612 +612 @@
     }
     FACTORY_ALGOUT( "G", ((lnumber)g1)->z );
-    g = convSingTrClapP( ((lnumber)g1)->z );
-    g = gcd( g, convSingTrClapP( ((lnumber)g2)->z ));
+    g = convSingTrFactoryP( ((lnumber)g1)->z );
+    g = gcd( g, convSingTrFactoryP( ((lnumber)g2)->z ));
 
     // second run: gcd's
@@ -622 +622 @@
     {
       FACTORY_ALGOUT( "h", (((lnumber)pGetCoeff(p))->z) );
-      h = convSingTrClapP( ((lnumber)pGetCoeff(p))->z );
+      h = convSingTrFactoryP( ((lnumber)pGetCoeff(p))->z );
       pIter( p );
 #ifdef FACTORY_GCD_STAT
@@ -653 +653 @@
         lnumber c=(lnumber)pGetCoeff(p);
         napDelete(&c->z);
-        c->z=convClapPSingTr( i.getItem() / g );
+        c->z=convFactoryPSingTr( i.getItem() / g );
         //nTest((number)c);
         //#ifdef LDEBUG
@@ -691 +691 @@
     && (currRing->parameter==NULL))
     {
-      F=convSingPClapP( f );
-      FAC=convSingPClapP( fac );
+      F=convSingPFactoryP( f );
+      FAC=convSingPFactoryP( fac );
     }
     // and over Q(a) / Fp(a)
@@ -700 +700 @@
       if (currRing->minpoly!=NULL)
       {
-        CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+        CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
         a=rootOf(mipo);
-        F=convSingAPClapAP( f,a );
-        FAC=convSingAPClapAP( fac,a );
+        F=convSingAPFactoryAP( f,a );
+        FAC=convSingAPFactoryAP( fac,a );
       }
       else
       {
-        F=convSingTrPClapP( f );
-        FAC=convSingTrPClapP( fac );
+        F=convSingTrPFactoryP( f );
+        FAC=convSingTrPFactoryP( fac );
       }
     }
@@ -727 +727 @@
         && (currRing->parameter==NULL))
         {
-          q = convClapPSingP( Q );
+          q = convFactoryPSingP( Q );
         }
         else if (( nGetChar()==1 ) /* Q(a) */
@@ -734 +734 @@
           if (currRing->minpoly!=NULL)
           {
-            q= convClapAPSingAP(  Q  );
+            q= convFactoryAPSingAP(  Q  );
           }
           else
           {
-            q= convClapPSingTrP(  Q  );
+            q= convFactoryPSingTrP(  Q  );
           }
         }
@@ -887 +887 @@
   {
     setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPClapP( f ) );
+    CanonicalForm F( convSingPFactoryP( f ) );
     if (nGetChar()==0) /* Q */
     {
@@ -911 +911 @@
     int c=rChar(currRing);
     setCharacteristic( c, primepower(c) );
-    CanonicalForm F( convSingGFClapGF( f ) );
+    CanonicalForm F( convSingGFFactoryGF( f ) );
     if (F.isUnivariate())
     {
@@ -929 +929 @@
     if (currRing->minpoly!=NULL)
     {
-      CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+      CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
       Variable a=rootOf(mipo);
-      CanonicalForm F( convSingAPClapAP( f,a ) );
+      CanonicalForm F( convSingAPFactoryAP( f,a ) );
       L.insert(F);
       if (rField_is_Zp_a() && F.isUnivariate())
@@ -939 +939 @@
       else
       {
-        CanonicalForm G( convSingTrPClapP( f ) );
+        CanonicalForm G( convSingTrPFactoryP( f ) );
 #ifdef HAVE_LIBFAC_P
         //  over Q(a) / multivariate over Fp(a)
@@ -969 +969 @@
     else
     {
-      CanonicalForm F( convSingTrPClapP( f ) );
+      CanonicalForm F( convSingTrPFactoryP( f ) );
       if (rField_is_Q_a())
       {
@@ -1012 +1012 @@
       if (with_exps!=1) (**v)[j] = J.getItem().exp();
       if (rField_is_Zp() || rField_is_Q())           /* Q, Fp */
-        //count_Factors(res,*v,f, j, convClapPSingP( J.getItem().factor() );
-        res->m[j] = convClapPSingP( J.getItem().factor() );
+        //count_Factors(res,*v,f, j, convFactoryPSingP( J.getItem().factor() );
+        res->m[j] = convFactoryPSingP( J.getItem().factor() );
       #if 0
       else if (rField_is_GF())
-        res->m[j] = convClapGFSingGF( J.getItem().factor() );
+        res->m[j] = convFactoryGFSingGF( J.getItem().factor() );
       #endif
       else if (rField_is_Extension())     /* Q(a), Fp(a) */
@@ -1023 +1023 @@
         if (v!=NULL) w=*v;
         if (currRing->minpoly==NULL)
-          count_Factors(res,w,j,ff,convClapPSingTrP( J.getItem().factor() ));
+          count_Factors(res,w,j,ff,convFactoryPSingTrP( J.getItem().factor() ));
         else
-          count_Factors(res,w,j,ff,convClapAPSingAP( J.getItem().factor() ));
+          count_Factors(res,w,j,ff,convFactoryAPSingAP( J.getItem().factor() ));
       }
     }
@@ -1186 +1186 @@
         p=pCopy(p);
         pCleardenom(p);
-        L.append(convSingPClapP(p));
+        L.append(convSingPFactoryP(p));
       }
     }
@@ -1203 +1203 @@
         p=pCopy(p);
         pCleardenom(p);
-        L.append(convSingTrPClapP(p));
+        L.append(convSingTrPFactoryP(p));
       }
     }
@@ -1246 +1246 @@
     {
       if ( (nGetChar() == 0) || (nGetChar() > 1) )
-        MATELEM(res,m,n)=convClapPSingP(Li.getItem());
+        MATELEM(res,m,n)=convFactoryPSingP(Li.getItem());
       else
-        MATELEM(res,m,n)=convClapPSingTrP(Li.getItem());
+        MATELEM(res,m,n)=convFactoryPSingTrP(Li.getItem());
     }
   }
@@ -1271 +1271 @@
     for(i=0;i<IDELEMS(I);i++)
     {
-      L.append(convSingPClapP(I->m[i]));
+      L.append(convSingPFactoryP(I->m[i]));
     }
   }
@@ -1282 +1282 @@
     for(i=0;i<IDELEMS(I);i++)
     {
-      L.append(convSingTrPClapP(I->m[i]));
+      L.append(convSingTrPFactoryP(I->m[i]));
     }
   }
@@ -1354 +1354 @@
   {
     setCharacteristic( nGetChar() );
-    CanonicalForm F( convSingPClapP( f ) );
+    CanonicalForm F( convSingPFactoryP( f ) );
     if((nGetChar()>1)&&(!F.isUnivariate()))
       goto err;
@@ -1367 +1367 @@
     //if (currRing->minpoly!=NULL)
     //{
-    //  CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+    //  CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
     //  Variable a=rootOf(mipo);
-    //  CanonicalForm F( convSingAPClapAP( f,a ) );
+    //  CanonicalForm F( convSingAPFactoryAP( f,a ) );
     //  ...
     //}
     //else
     {
-      CanonicalForm F( convSingTrPClapP( f ) );
+      CanonicalForm F( convSingTrPFactoryP( f ) );
       b=(BOOLEAN)isSqrFree(F);
     }
@@ -1406 +1406 @@
       for(j=r;j>0;j--)
       {
-        M(i,j)=convSingPClapP(MATELEM(m,i,j));
-      }
-    }
-    res= convClapPSingP( determinant(M,r) ) ;
+        M(i,j)=convSingPFactoryP(MATELEM(m,i,j));
+      }
+    }
+    res= convFactoryPSingP( determinant(M,r) ) ;
   }
   // and over Q(a) / Fp(a)
@@ -1421 +1421 @@
     if (currRing->minpoly!=NULL)
     {
-      CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+      CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
       Variable a=rootOf(mipo);
       int i,j;
@@ -1428 +1428 @@
         for(j=r;j>0;j--)
         {
-          M(i,j)=convSingAPClapAP(MATELEM(m,i,j),a);
+          M(i,j)=convSingAPFactoryAP(MATELEM(m,i,j),a);
         }
       }
-      res= convClapAPSingAP( determinant(M,r) ) ;
+      res= convFactoryAPSingAP( determinant(M,r) ) ;
     }
     else
@@ -1440 +1440 @@
         for(j=r;j>0;j--)
         {
-          M(i,j)=convSingTrPClapP(MATELEM(m,i,j));
+          M(i,j)=convSingTrPFactoryP(MATELEM(m,i,j));
         }
       }
-      res= convClapPSingTrP( determinant(M,r) );
+      res= convFactoryPSingTrP( determinant(M,r) );
     }
   }
@@ -1464 +1464 @@
     }
   }
-  int res= convClapISingI( determinant(M,m->rows())) ;
+  int res= convFactoryISingI( determinant(M,m->rows())) ;
   Off(SW_RATIONAL);
   return res;
@@ -1480 +1480 @@
  if (currRing->minpoly!=NULL)
  {
-   CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+   CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
    Variable a=rootOf(mipo);
-   CanonicalForm F( convSingAClapA( f,a ) ), G( convSingAClapA( g,a ) );
+   CanonicalForm F( convSingAFactoryA( f,a ) ), G( convSingAFactoryA( g,a ) );
    CanonicalForm GCD;
 
@@ -1498 +1498 @@
 
    // calculate lcm
-   res= convClapASingA( (F/GCD)*G );
+   res= convFactoryASingA( (F/GCD)*G );
  }
  else
  {
-   CanonicalForm F( convSingTrClapP( f ) ), G( convSingTrClapP( g ) );
+   CanonicalForm F( convSingTrFactoryP( f ) ), G( convSingTrFactoryP( g ) );
    CanonicalForm GCD;
    TIMING_START( algLcmTimer );
@@ -1517 +1517 @@
 
    // calculate lcm
-   res= convClapPSingTr( (F/GCD)*G );
+   res= convFactoryPSingTr( (F/GCD)*G );
  }
 
@@ -1537 +1537 @@
  if (currRing->minpoly!=NULL)
  {
-   CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+   CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
    Variable a=rootOf(mipo);
-   CanonicalForm F( convSingAClapA( f,a ) ), G( convSingAClapA( g,a ) );
+   CanonicalForm F( convSingAFactoryA( f,a ) ), G( convSingAFactoryA( g,a ) );
    CanonicalForm GCD;
 
@@ -1555 +1555 @@
    if ((GCD!=1) && (GCD!=0))
    {
-     ff= convClapASingA( F/ GCD );
-     gg= convClapASingA( G/ GCD );
+     ff= convFactoryASingA( F/ GCD );
+     gg= convFactoryASingA( G/ GCD );
    }
  }
  else
  {
-   CanonicalForm F( convSingTrClapP( f ) ), G( convSingTrClapP( g ) );
+   CanonicalForm F( convSingTrFactoryP( f ) ), G( convSingTrFactoryP( g ) );
    CanonicalForm GCD;
 
@@ -1577 +1577 @@
    if ((GCD!=1) && (GCD!=0))
    {
-     ff= convClapPSingTr( F/ GCD );
-     gg= convClapPSingTr( G/ GCD );
+     ff= convFactoryPSingTr( F/ GCD );
+     gg= convFactoryPSingTr( G/ GCD );
    }
  }
@@ -1608 +1608 @@
     {
       number N=(number)x->m[i-1].Data();
-      X[i]=convSingNClapN(N);
+      X[i]=convSingNFactoryN(N);
     }
     else
@@ -1623 +1623 @@
     {
       number N=(number)x->m[i-1].Data();
-      Q[i]=convSingNClapN(N);
+      Q[i]=convSingNFactoryN(N);
     }
     else
@@ -1637 +1637 @@
   res->m[0].rtyp=NUMBER_CMD;
   res->m[1].rtyp=NUMBER_CMD;
-  res->m[0].data=(char *)convClapNSingN( r );
-  res->m[1].data=(char *)convClapNSingN( prod );
+  res->m[0].data=(char *)convFactoryNSingN( r );
+  res->m[1].data=(char *)convFactoryNSingN( prod );
   return res;
 }

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.30 2007-07-24 16:55:07 Singular Exp $ */
+/* $Id: longalg.cc,v 1.31 2008-01-07 13:36:16 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -1679 +1679 @@
     napoly rz=napGcd(x->z, y->z);
     CanonicalForm F, G, R;
-    R=convSingTrClapP(rz); 
+    R=convSingTrFactoryP(rz); 
     napNormalize(x->z);
-    F=convSingTrClapP(x->z)/R; 
+    F=convSingTrFactoryP(x->z)/R; 
     napNormalize(y->z);
-    G=convSingTrClapP(y->z)/R; 
+    G=convSingTrFactoryP(y->z)/R; 
     F = gcd( F, G );
     if (F.isOne()) 
@@ -1690 +1690 @@
     {
       napDelete(&rz);
-      result->z=convClapPSingTr( F*R );
+      result->z=convFactoryPSingTr( F*R );
       napNormalize(result->z);
     }

kernel/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.25 2007-09-13 14:27:50 Singular Exp $ */
+/* $Id: longrat.cc,v 1.26 2008-01-07 13:36:16 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -64 +64 @@
 */
 #define SR_HDL(A) ((long)(A))
-/*#define SR_INT    1*/
+/*#define SR_INT    1L*/
 /*#define INT_TO_SR(INT)  ((number) (((long)INT << 2) + SR_INT))*/
 // #define SR_TO_INT(SR)   (((long)SR) >> 2)