Changeset 54fc4e in git for libpolys/coeffs/rintegers.cc

Timestamp:

Oct 26, 2013, 5:03:16 PM (11 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ea3c090b559b31abca294f2172ec7d3304bd4ab7

Parents:

2a2ba4fcd246395ea2e5d241d8945e66d030c103

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2013-10-26 17:03:16+02:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2014-07-22 12:24:18+02:00

Message:

new: division and gcd of integer polynomials via factory

added conversion functions between integer polynomials in Singular and Factory
extended the singclap_gcd and singclap_pdivide functions to cover the case where
ground ring is integer

File:

• libpolys/coeffs/rintegers.cc (modified) (3 diffs)

libpolys/coeffs/rintegers.cc

@@ -23 +23 @@
 #include <coeffs/rmodulon.h>
 #include "si_gmp.h"
+
+#ifdef HAVE_FACTORY
+#include <factory/factory.h>
+#endif
 
 /// Our Type!
@@ -368 +372 @@
   return s;
 }
+
+
+#ifdef HAVE_FACTORY
+CanonicalForm nrzConvSingNFactoryN(number n, BOOLEAN setChar, const coeffs /*r*/)
+{
+  if (setChar) setCharacteristic( 0 );
+
+  CanonicalForm term;
+  mpz_t num;
+  mpz_init_set(num, *((mpz_t*)n));
+  term = make_cf(num);
+  return term;
+}
+
+number nrzConvFactoryNSingN(const CanonicalForm n, const coeffs r)
+{
+  if (n.isImm())
+    return nrzInit(n.intval(),r);
+  else
+  {
+    int_number m = (int_number) omAllocBin(gmp_nrz_bin);
+    gmp_numerator(n,m);
+    return (number) m;
+  }
+}
+#endif // HAVE_FACTORY
 
 const char * nrzRead (const char *s, number *a, const coeffs)
@@ -447 +477 @@
   r->cfSetMap = nrzSetMap;
   r->cfCoeffWrite = nrzCoeffWrite;
-  r->cfQuot1 = nrzQuot1;
+  r->cfQuot1 = nrzQuot1;  
+#ifdef HAVE_FACTORY
+  r->convSingNFactoryN=nrzConvSingNFactoryN;
+  r->convFactoryNSingN=nrzConvFactoryNSingN;
+#endif
   // debug stuff