Changeset de90c01 in git

Timestamp:

Jun 28, 2011, 5:24:13 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

010f3bf0c665c71ec55b5bb0d7d518fd24e73ed0

Parents:

f59722f94f8a42963b69fe4389c1ce3850e4f87e

git-author:

Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-06-28 17:24:13+02:00

git-committer:

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

Message:

poly_tests for transcendental ext fields

Location:

libpolys

Files:

• polys/ext_fields/transext.cc (modified) (9 diffs)
• polys/ext_fields/transext.h (modified) (1 diff)
• tests/polys_test.h (modified) (4 diffs)

libpolys/polys/ext_fields/transext.cc

@@ -30 +30 @@
 /// our type has been defined as a macro in transext.h
 /// and is accessible by 'ntID'
+
+extern omBin fractionObjectBin = omGetSpecBin(sizeof(fractionObject));
 
 /// forward declarations
@@ -340 +342 @@
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
+  
+  poly g = p_Copy(num(fa), ntRing);
+  if (!denIs1(fb)) g = p_Mult_q(g, p_Copy(den(fb), ntRing), ntRing);
+  poly h = p_Copy(num(fb), ntRing);
+  if (!denIs1(fa)) h = p_Mult_q(h, p_Copy(den(fa), ntRing), ntRing);
+  g = p_Add_q(g, h, ntRing);
+  
+  if (g == NULL) return NULL;
+  
   poly f;
   if      (denIs1(fa) && denIs1(fb))  f = NULL;
@@ -347 +358 @@
                                                    p_Copy(den(fb), ntRing),
                                                    ntRing);
-  poly g = p_Copy(num(fa), ntRing);
-  if (!denIs1(fb)) g = p_Mult_q(g, p_Copy(den(fb), ntRing), ntRing);
-  poly h = p_Copy(num(fb), ntRing);
-  if (!denIs1(fa)) h = p_Mult_q(h, p_Copy(den(fa), ntRing), ntRing);
-  g = p_Add_q(g, h, ntRing);
+  
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   num(result) = g;
@@ -368 +375 @@
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
+  
+  poly g = p_Copy(num(fa), ntRing);
+  if (!denIs1(fb)) g = p_Mult_q(g, p_Copy(den(fb), ntRing), ntRing);
+  poly h = p_Copy(num(fb), ntRing);
+  if (!denIs1(fa)) h = p_Mult_q(h, p_Copy(den(fa), ntRing), ntRing);
+  g = p_Add_q(g, p_Neg(h, ntRing), ntRing);
+  
+  if (g == NULL) return NULL;
+  
   poly f;
   if      (denIs1(fa) && denIs1(fb))  f = NULL;
@@ -375 +391 @@
                                                    p_Copy(den(fb), ntRing),
                                                    ntRing);
-  poly g = p_Copy(num(fa), ntRing);
-  if (!denIs1(fb)) g = p_Mult_q(g, p_Copy(den(fb), ntRing), ntRing);
-  poly h = p_Copy(num(fb), ntRing);
-  if (!denIs1(fa)) h = p_Mult_q(h, p_Copy(den(fa), ntRing), ntRing);
-  g = p_Add_q(g, p_Neg(h, ntRing), ntRing);
+  
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   num(result) = g;
@@ -395 +407 @@
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
+  
+  poly g = p_Copy(num(fa), ntRing);
+  poly h = p_Copy(num(fb), ntRing);
+  g = p_Mult_q(g, h, ntRing);
+  
+  if (g == NULL) return NULL;   /* may happen due to zero divisors */
+  
   poly f;
   if      (denIs1(fa) && denIs1(fb))  f = NULL;
@@ -402 +421 @@
                                                    p_Copy(den(fb), ntRing),
                                                    ntRing);
-  poly g = p_Copy(num(fa), ntRing);
-  poly h = p_Copy(num(fb), ntRing);
-  g = p_Mult_q(g, h, ntRing);
+  
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   num(result) = g;
@@ -421 +438 @@
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
+  
+  poly g = p_Copy(num(fa), ntRing);
+  if (!denIs1(fb)) g = p_Mult_q(g, p_Copy(den(fb), ntRing), ntRing);
+  
+  if (g == NULL) return NULL;   /* may happen due to zero divisors */
+  
   poly f = p_Copy(num(fb), ntRing);
   if (!denIs1(fa)) f = p_Mult_q(f, p_Copy(den(fa), ntRing), ntRing);
-  poly g = p_Copy(num(fa), ntRing);
-  if (!denIs1(fb)) g = p_Mult_q(g, p_Copy(den(fb), ntRing), ntRing);
+  
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   num(result) = g;
@@ -559 +581 @@
 }
 
-/* this just reads polynomials;
-   the rest will be taken care of by the interpreter: When it encounters
-   a "/", then it will impose a division that will finally lead to a
-   rational function */
 const char * ntRead(const char *s, number *a, const coeffs cf)
 {

libpolys/polys/ext_fields/transext.h

@@ -52 +52 @@
 };
 typedef struct fractionObject * fraction;
-
-omBin fractionObjectBin = omGetSpecBin(sizeof(fractionObject));
 
 /* constants for controlling the complexity of numbers */

libpolys/tests/polys_test.h

@@ -16 +16 @@
 
 #include <polys/ext_fields/algext.h>
+#include <polys/ext_fields/transext.h>
 #include <polys/monomials/ring.h>
 #include <polys/monomials/p_polys.h>
@@ -21 +22 @@
 #include <polys/simpleideals.h>
 
-#ifdef HAVE_FACTORY
+#if 0 //ifdef HAVE_FACTORY
 #include <polys/clapsing.h>
 #include <factory/factory.h>
@@ -223 +224 @@
   void checkInverse(number n, const coeffs cf)
   {
-    clog << "n = "; n_Write(n, cf);
+    clog << "n = "; p_Write((poly)n, cf->extRing);
     number n1 = n_Invers(n, cf);
-    clog << "==> n^(-1) = "; n_Write(n1, cf);
+    clog << "==> n^(-1) = "; p_Write((poly)n1, cf->extRing);
     number n2 = n_Mult(n, n1, cf);
-    clog << "(check: n * n^(-1) = "; n_Write(n2, cf);
+    clog << "check: n * n^(-1) = "; p_Write((poly)n2, cf->extRing);
     TS_ASSERT( n_IsOne(n2, cf) );
     n_Delete(&n1, cf); n_Delete(&n2, cf);
@@ -858 +859 @@
 
     Test(s);
-    /*
-#ifdef HAVE_FACTORY
-    poly f = p_ISet(3, s);
-    p_SetExp(f, 1, 3, s);
-    p_SetExp(f, 2, 1, s);
-    p_SetExp(f, 3, 5, s);
-    p_Setm(f, r);   // 3*u^3*v*w^5
-    plusTerm(f, -2, 1, 6, s); // -2*u^6 + 3*u^3*v*w^5
-    p_Write(f, s);
-    poly g = p_ISet(7, s);
-    p_SetExp(g, 1, 5, s);
-    p_SetExp(g, 2, 6, s);
-    p_SetExp(g, 3, 2, s);
-    p_Setm(g, r);   // 7*u^5*v^6*w^2
-    plusTerm(g, 8, 1, 4, s); // 7*u^5*v^6*w^2 + 8*u^4
-    p_Write(g, s);
-    poly h = singclap_gcd(f, g, s);   // at least u^3, destroys f and g
-    p_Write(h, s);
-    p_Test(h, s);
-    p_Delete(&h, s);
-#endif
-    */
+    
     rDelete(s); // kills 'cf' and 'r' as well
   }
+  void test_Q_Ext_s_t()
+  {
+    clog << "Start by creating Q[s, t]..." << endl;
+
+    char* n[] = {"s", "t"};
+    ring r = rDefault( 0, 2, n);   // Q[s, t]
+    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, 17) );
+
+    TS_ASSERT_EQUALS( rVar(r), 2);
+
+    n_coeffType type = nRegister(n_transExt, ntInitChar);
+    TS_ASSERT(type == n_transExt);
+
+    TransExtInfo extParam;
+    extParam.r = r;
+
+    clog << "Next create the rational function field Q(s, t)..." << endl;
+
+    const coeffs cf = nInitChar(type, &extParam);   // Q(s, t)
+
+    if( cf == NULL )
+      TS_FAIL("Could not get needed coeff. domain");
+
+    TS_ASSERT_DIFFERS( cf->cfCoeffWrite, NULLp );
+
+    if( cf->cfCoeffWrite != NULL )
+    {
+      clog << "Coeff-domain: "  << endl;
+      n_CoeffWrite(cf); PrintLn();
+    }
+
+    TS_ASSERT( !nCoeff_is_algExt(cf) );
+    TS_ASSERT( nCoeff_is_transExt(cf) );
+
+    // some tests for the coefficient field represented by cf:
+    TestArithCf(cf);
+    TestSumCf(cf, 10);
+    TestSumCf(cf, 100);
+    TestSumCf(cf, 101);
+    TestSumCf(cf, 1001);
+    TestSumCf(cf, 9000);
+
+    clog << "Finally create the polynomial ring Q(s, t)[x, y, z]..."
+         << endl;
+
+    char* m[] = {"x", "y", "z"};
+    ring s = rDefault(cf, 3, m);   // Q(s, t)[x, y, z]
+    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, 17) );
+    TS_ASSERT( !rField_is_GF(s) );
+    TS_ASSERT( rField_is_Extension(s) );
+    TS_ASSERT( !rField_is_GF(s, 25) );
+    TS_ASSERT_EQUALS(rVar(s), 3);
+
+    Test(s);
+    
+    rDelete(s); // kills 'cf' and 'r' as well
+  }
 };