Changeset eca225 in git

Timestamp:

May 6, 2011, 2:06:50 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a934fc81ed0805bcf6e3c2c3cd59b3b0c6fa8146

Parents:

e25a9942ffbe09b3e9cd1348617f1c1886c896bd

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-05-06 14:06:50+02:00

git-committer:

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

Message:

factory to number: Z/p

Location:

libpolys/coeffs

Files:

• coeffs.h (modified) (3 diffs)
• modulop.cc (modified) (2 diffs)
• numbers.cc (modified) (2 diffs)

libpolys/coeffs/coeffs.h

@@ -14 +14 @@
 #include <coeffs/si_gmp.h>
 
+#ifdef HAVE_FACTORY
+#include <factory/factory.h>
+#endif
+
 enum n_coeffType
 {
@@ -24 +28 @@
   n_Ext,  // used for all extensions (of Zp, of Q AND OF EXTENSIONS THEREOF)
   n_long_C,
-  // only used if HAVE_RINGS is defined
+  // only used if HAVE_RINGS is defined:
   n_Z,
   n_Zn,
@@ -145 +149 @@
    char *  (*cfName)(number n, const coeffs r);
 
-   /// Inline: a := b
+   /// Inplace: a *= b
    void    (*cfInpMult)(number &a, number b, const coeffs r);
    /// maps the bigint i (from dummy) into the coeffs dst
    number  (*cfInit_bigint)(number i, const coeffs dummy, const coeffs dst);
+
+#ifdef HAVE_FACTORY
+   number (*convFactoryNSingN)( const CanonicalForm n, const coeffs r);
+   CanonicalForm (*convSingNFactoryN)( number n, const coeffs r );
+#endif
+
 
 #ifdef LDEBUG

libpolys/coeffs/modulop.cc

@@ -321 +321 @@
   return (n==n_Zp) && (r->ch==(int)(long)parameter);
 }
+#ifdef HAVE_FACTORY
+CanonicalForm npConvSingNFactoryN( number n, const coeffs r )
+{
+  CanonicalForm term(npInt( n,r ));
+  return term;
+}
+
+number npConvFactoryNSingN( const CanonicalForm n, const coeffs r)
+{
+  if (n.isImm())
+  {
+    return n_Init(n.intval(),r);
+  }
+  else
+  {
+    assume(0);
+  }
+}
+#endif
+
 
 BOOLEAN npInitChar(coeffs r, void* p)
@@ -396 +416 @@
   r->cfDBTest=npDBTest;
 #endif
+
+#ifdef HAVE_FACTORY
+  r->convSingNFactoryN=npConvSingNFactoryN;
+  r->convFactoryNSingN=npConvFactoryNSingN;
+#endif
   
   // the variables:

libpolys/coeffs/numbers.cc

@@ -119 +119 @@
 number  ndExtGcd (number a, number b, number *s, number *t, const coeffs r) { return n_Init(1,r); }
 #endif
+
+#ifdef HAVE_FACTORY
+CanonicalForm npConvSingNFactoryN( number n, const coeffs r )
+{
+  CanonicalForm term(0);
+  Werror("no conversion to factory");
+  return term;
+}
+
+number npConvFactoryNSingN( const CanonicalForm n, const coeffs r)
+{
+  Werror("no conversion from factory");
+  return NULL;
+}
+#endif
+
 
 static n_coeffType nLastCoeffs=n_Z2m;
@@ -161 +177 @@
     n->cfExtGcd = ndExtGcd;
     //n->cfGetUnit = (nMapFunc)NULL;
+#endif
+
+#ifdef fACTORY
+    n->convSingNFactoryN=ndConvSingNFactoryN;
+    n->convFactoryNSingN=ndConvFactoryNSingN;
 #endif