Changeset a934fc8 in git

Timestamp:

May 6, 2011, 3:52:31 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

ad35b5aa4162741cdf8ed43431d40b098724e388

Parents:

eca225734b56a5d965350b362be8ec9a6c986759

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-05-06 15:52:31+02:00

git-committer:

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

Message:

factory -> number: Q

Files:

• kernel/clapconv.cc (modified) (1 diff)
• kernel/clapconv.h (modified) (1 diff)
• libpolys/coeffs/longrat.cc (modified) (1 diff)
• libpolys/coeffs/modulop.cc (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (2 diffs)

kernel/clapconv.cc

@@ -36 +36 @@
 
 static number convFactoryNSingAN( const CanonicalForm &f, const ring r);
-
-CanonicalForm convSingNFactoryN( number n, const ring r )
-{
-  CanonicalForm term;
-  /* does only work for Zp, Q */
-  if ((r==NULL) || rField_is_Q(r))
-  {
-    if ( SR_HDL(n) & SR_INT )
-    {
-      term = SR_TO_INT(n);
-    }
-    else
-    {
-      if ( n->s == 3 )
-      {
-        lint dummy;
-        mpz_init_set( &dummy,n->z );
-        term = make_cf( dummy );
-      }
-      else
-      {
-        // assume s==0 or s==1
-        lint num, den;
-        On(SW_RATIONAL);
-        mpz_init_set( &num, n->z );
-        mpz_init_set( &den, n->n );
-        term = make_cf( num, den, ( n->s != 1 ));
-      }
-    }
-  }
-  else /*if ( (r!=NULL) && rField_is_Zp(r) ) */
-  {
-    term = npInt( n,r );
-  }
-  return term;
-}
-
-number convFactoryNSingN( const CanonicalForm & n, const ring r)
-{
-  if (n.isImm())
-  {
-    if (r==NULL) return nlInit(n.intval(),NULL);
-    else         return n_Init(n.intval(),r);
-  }
-  else
-  {
-    number z=ALLOC_RNUMBER();
-#if defined(LDEBUG)
-    z->debug=123456;
-#endif
-    gmp_numerator( n, z->z );
-    if ( n.den().isOne() )
-      z->s = 3;
-    else
-    {
-      gmp_denominator( n, z->n );
-      z->s = 0;
-    }
-    nlNormalize(z);
-    return z;
-  }
-}
-
-//number convFactoryNSingN( const CanonicalForm & n)
-//{
-//  return convFactoryNSingN(n,currRing);
-//}
-
 
 poly convFactoryPSingP ( const CanonicalForm & f, const ring r )

kernel/clapconv.h

@@ -35 +35 @@
 poly convFactoryPSingTrP ( const CanonicalForm & f, const ring r=currRing );
 
-CanonicalForm convSingNFactoryN( number n, const ring r );
-number convFactoryNSingN( const CanonicalForm & n, const ring r);
-
-
 // CanonicalForm convSingIFactoryI( int i);a <- by constructor of CanonicalForm
 int convFactoryISingI( const CanonicalForm & f);

libpolys/coeffs/longrat.cc

@@ -267 +267 @@
 #endif
 
+#ifdef HAVE_FACTORY
+CanonicalForm nlConvSingNFactoryN( number n, const coeffs r )
+{
+  CanonicalForm term;
+  if ( SR_HDL(n) & SR_INT )
+  {
+    term = SR_TO_INT(n);
+  }
+  else
+  {
+    if ( n->s == 3 )
+    {
+      MP_INT dummy;
+      mpz_init_set( &dummy,n->z );
+      term = make_cf( dummy );
+    }
+    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, ( n->s != 1 ));
+    }
+  }
+  return term;
+}
+
+number nlConvFactoryNSingN( const CanonicalForm n, const coeffs r)
+{
+  if (n.isImm())
+  {
+    return nlInit(n.intval(),r);
+  }
+  else
+  {
+    number z=(number)omAllocBin(rnumber_bin);
+#if defined(LDEBUG)
+    z->debug=123456;
+#endif
+    gmp_numerator( n, z->z );
+    if ( n.den().isOne() )
+      z->s = 3;
+    else
+    {
+      gmp_denominator( n, z->n );
+      z->s = 0;
+    }
+    nlNormalize(z,r);
+    return z;
+  }
+}
+#endif
 number nlRInit (long i);
 

libpolys/coeffs/modulop.cc

@@ -332 +332 @@
   if (n.isImm())
   {
-    return n_Init(n.intval(),r);
+    return npInit(n.intval(),r);
   }
   else

libpolys/polys/clapsing.cc

@@ -45 +45 @@
   if((pNext(f)==NULL) && (pNext(g)==NULL))
   {
-    poly p=pOne();
+    poly p=p_One(r);
     for(int i=rVar(r);i>0;i--)
       p_SetExp(p,i,si_min(p_GetExp(f,i,r),p_GetExp(g,i,r)),r);
@@ -57 +57 @@
   if (rField_is_Q(r) || (rField_is_Zp(r)))
   {
-    setCharacteristic( n_GetChar(r) );
+    setCharacteristic( n_GetChar(r->cf) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g, r ) );
     res=convFactoryPSingP( gcd( F, G ) , r);