Changeset 146c603 in git for libpolys/polys/ext_fields

Timestamp:

Nov 9, 2011, 10:13:02 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8f40312428677d88ab37a31824f2ec53f144a18a

Parents:

fc497757365979d0168460de9969b49bc49c53f2

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-11-09 10:13:02+01:00

git-committer:

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

Message:

fix: nlModP (should not use nvDiv/npDiv
implement conversion to/from factory for algext

File:

• libpolys/polys/ext_fields/algext.cc (modified) (4 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -44 +44 @@
 #include <polys/simpleideals.h>
 
+#ifdef HAVE_FACTORY
+#include <polys/clapconv.h>
+#include <factory/factory.h>
+#endif
+
 #include "ext_fields/algext.h"
 #define TRANSEXT_PRIVATES 1
@@ -522 +527 @@
 }
 
+void  naNormalize(number &a, const coeffs cf)
+{
+  poly aa=(poly)a;
+  definiteReduce(aa,naMinpoly,cf); 
+  a=(number)aa;
+}
+
+#ifdef HAVE_FACTORY
+number naConvFactoryNSingN( const CanonicalForm n, const coeffs cf)
+{
+  if (n.isZero()) return NULL;
+  poly p=convFactoryPSingP(n,naRing);
+  return (number)p;
+}
+CanonicalForm naConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs cf )
+{
+  naTest(n);
+  if (n==NULL) return CanonicalForm(0);
+
+  return convSingPFactoryP((poly)n,naRing);
+}
+#endif
+
+
 /* IMPORTANT NOTE: Since an algebraic field extension is again a field,
                    the gcd of two elements is not very interesting. (It
@@ -735 +764 @@
   cf->cfImPart       = naImPart;
   cf->cfCoeffWrite   = naCoeffWrite;
+  cf->cfNormalize    = naNormalize;
 #ifdef LDEBUG
   cf->cfDBTest       = naDBTest;
@@ -744 +774 @@
   cf->cfInvers       = naInvers;
   cf->cfIntDiv       = naDiv;
+#ifdef HAVE_FACTORY
+  cf->convFactoryNSingN=naConvFactoryNSingN;
+  cf->convSingNFactoryN=naConvSingNFactoryN;
+#endif
   
   return FALSE;