Changeset fba6f18 in git

Timestamp:

May 5, 2011, 2:41:36 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

ba23594edc15991ab3d4bd71e011e4139bb72c92

Parents:

ce3f53c9db13dc43a04d51988cc1a5ea929e0f6d

git-author:

Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-05-05 14:41:36+02:00

git-committer:

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

Message:

alg. ext. fields: 1st impl. and 1st tests

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (4 diffs)
• polys/Makefile.am (modified) (2 diffs)
• polys/ext_fields/algext.cc (added)
• polys/ext_fields/algext.h (added)
• polys/simpleideals.cc (modified) (1 diff)
• tests/polys_test.h (modified) (2 diffs)

libpolys/coeffs/coeffs.h

@@ -63 +63 @@
 {
    coeffs next;
-   unsigned int  ringtype;  /* 0 => coefficient field, 1 => coeffs from Z/2^m */
+   unsigned int ringtype;  /* =0 => coefficient field,
+                             !=0 => coeffs from one of the rings */
 
    // general properties:
@@ -297 +298 @@
 { assume(r != NULL); assume(r->cfInit!=NULL); return r->cfInit(i,r); }
 
+/// conversion to int; 0 if not possible
+static inline int n_Int(number n,        const coeffs r)
+{ assume(r != NULL); assume(r->cfInt!=NULL); return r->cfInt(n,r); }
+
 /// changes argument  inline: a:= -a
 static inline number n_Neg(number n,     const coeffs r)
@@ -436 +441 @@
 
 static inline BOOLEAN nCoeff_is_Zp_a(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 0) && (r->ch < -1); }
+{
+  assume(r != NULL);
+  return (r->ringtype == 0) && (getCoeffType(r)==n_Ext) && (r->ch < -1);
+}
 
 static inline BOOLEAN nCoeff_is_Zp_a(const coeffs r, int p)
-{ assume(r != NULL); return (r->ringtype == 0) && (r->ch < -1 ) && (-(r->ch) == ABS(p)); }
+{
+  assume(r != NULL);
+  return (r->ringtype == 0) && (getCoeffType(r)==n_Ext) && (r->ch < -1 )
+                            && (-(r->ch) == ABS(p));
+}
 
 static inline BOOLEAN nCoeff_is_Q_a(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 0) && (r->ch == 1); }
+{
+  assume(r != NULL);
+  return (r->ringtype == 0) && (getCoeffType(r)==n_Ext) && (r->ch == 0);
+}
 
 static inline BOOLEAN nCoeff_is_long_R(const coeffs r)
@@ -485 +500 @@
 
 // Missing wrappers for:
-// cfIntMod, cfInt, cfRePart, cfImPart, cfRead, cfName, cfInit_bigint
+// cfIntMod, cfRePart, cfImPart, cfRead, cfName, cfInit_bigint
 // HAVE_RINGS: cfDivComp, cfExtGcd... cfDivBy
 

libpolys/polys/Makefile.am

@@ -38 +38 @@
         kbuckets.cc sbuckets.cc weight.cc weight0.c simpleideals.cc matpol.cc \
         ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC} templates/mod_raw.cc \
-        clapsing.cc
+        clapsing.cc ext_fields/algext.cc
 
 BUILT_SOURCES = templates/p_Procs.inc
@@ -53 +53 @@
         monomials/p_polys.h monomials/polys-impl.h monomials/maps.h polys.h prCopy.h prCopyMacros.h \
         kbuckets.h sbuckets.h simpleideals.h weight.h matpol.h \
-        clapsing.h
+        clapsing.h ext_fields/algext.h
 
 P_PROCS_CPPFLAGS_COMMON = -DHAVE_CONFIG_H -DDYNAMIC_VERSION 

libpolys/polys/simpleideals.cc

@@ -25 +25 @@
 #include "sbuckets.h"
 
-omBin sip_sideal_bin;
+omBin sip_sideal_bin = omGetSpecBin(sizeof(sip_sideal));
 
 static poly * idpower;

libpolys/tests/polys_test.h

@@ -15 +15 @@
 #include <coeffs/rintegers.h>
 
-
+#include <polys/ext_fields/algext.h>
 #include <polys/monomials/ring.h>
 #include <polys/monomials/p_polys.h>
 
-
-
+#include <polys/simpleideals.h>
 
 class MyGlobalPrintingFixture : public GlobalPrintingFixture
@@ -335 +334 @@
      rDelete(r); // kills 'cf' as well!
    }
-
+   
+  void test_Q_Ext_a()
+  {
+    clog << "Start by creating Q[a]..." << endl;
+
+    char* n[] = {"a"};
+    ring r = rDefault( 0, 1, n);   // Q[a]
+    TS_ASSERT_DIFFERS( r, NULLp );
+
+    PrintRing(r);
+
+    TS_ASSERT( rField_is_Domain(r) );
+    TS_ASSERT( rField_is_Q(r) );
+    
+    TS_ASSERT( !rField_is_Zp(r) );
+    TS_ASSERT( !rField_is_Zp(r, 11) );
+
+    TS_ASSERT_EQUALS( rVar(r), 1);
+
+    poly minPoly = p_ISet(1, r);                    // minPoly = 1
+    p_SetExp(minPoly, 1, 2, r); p_Setm(minPoly, r); // minPoly = a^2
+    minPoly = p_Add_q(minPoly, p_ISet(1, r), r);    // minPoly = a^2 + 1
+    ideal minIdeal = idInit(1);                     // minIdeal = < 0 >
+    minIdeal->m[0] = minPoly;                       // minIdeal = < a^2 + 1 >
+
+    n_coeffType type = nRegister(n_Ext, naInitChar); 
+    TS_ASSERT(type == n_Ext);
+
+    ExtInfo extParam;
+    extParam.r = r;
+    extParam.i = minIdeal;
+    
+    clog << "Next create the extension field Q[a]/<a2+1>..." << endl;
+
+    const coeffs cf = nInitChar(type, &extParam);   // Q[a]/<a2+1>
+
+    TS_ASSERT_DIFFERS( cf->cfCoeffWrite, NULLp );
+  
+    if( cf->cfCoeffWrite != NULL )
+    {
+      clog << "Coeff-domain: "  << endl; 
+      n_CoeffWrite(cf); PrintLn();
+    }
+
+    clog << "Finally create the polynomial ring (Q[a]/<a2+1>)[x, y]..."
+         << endl;
+    
+    char* m[] = {"x", "y"};
+    ring s = rDefault(cf, 2, m);   // (Q[a]/<a2+1>)[x, y]
+    TS_ASSERT_DIFFERS(s, NULLp);
+
+    PrintRing(s);
+
+    TS_ASSERT( rField_is_Domain(s) );
+    TS_ASSERT( !rField_is_Q(s) );
+    TS_ASSERT( !rField_is_Zp(s) );
+    TS_ASSERT( !rField_is_Zp(s, 11) );
+    TS_ASSERT( !rField_is_Zp(s, 13) );
+    TS_ASSERT( !rField_is_GF(s) );
+    TS_ASSERT( rField_is_Extension(s) );
+    TS_ASSERT( !rField_is_GF(s, 25) );
+    TS_ASSERT_EQUALS(rVar(s), 2);
+
+    //Test(s);
+
+    rDelete(s); // kills 'cf' and 'r' as well
+  }
 };