Changeset a934fc8 in git for libpolys/coeffs/longrat.cc

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

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

File:

• libpolys/coeffs/longrat.cc (modified) (1 diff)

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);