Changeset e72a9a in git

Timestamp:

Sep 10, 2013, 2:42:09 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

918ca09282483016057240878bd4a20cd2d7305f

Parents:

c149e345cb58e789ed28fe569ddaee8906cdbdc7

Message:

removed rField_is_Extension (alg. or trans. ext. ?)

Files:

• Singular/iparith.cc (modified) (2 diffs)
• Singular/ipshell.cc (modified) (1 diff)
• Singular/subexpr.cc (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (12 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.h (modified) (2 diffs)
• libpolys/tests/polys_test.h (modified) (6 diffs)

Singular/iparith.cc

@@ -4059 +4059 @@
 {
   lists L=(lists)omAllocBin(slists_bin);
-  if (rField_is_Zp(currRing)
-  || rField_is_Q(currRing)
-  || rField_is_Zp_a(currRing)
-  || rField_is_Q_a(currRing))
+  if (currRing->cf->convSingNFactoryN!=NULL) /* conversion to factory*/
   {
     ideal_list p,h;
@@ -6384 +6381 @@
   if ((ringvar=pVar(p))==0)
   {
-    if ((p!=NULL) && rField_is_Extension(currRing))
-    {
-      assume(currRing->cf->extRing!=NULL);
+    if ((p!=NULL) && (currRing->cf->extRing!=NULL))
+    {
       number n = pGetCoeff(p);
       ringvar= -n_IsParam(n, currRing);

Singular/ipshell.cc

@@ -1798 +1798 @@
   else if (rIsExtension(r))
   {
-    if ( rField_is_Extension(r) )// nCoeff_is_algExt(r->cf))
-    {
-      assume( r->cf != NULL );
-      assume( r->cf->extRing != NULL );
-
+    if ( r->cf->extRing!=NULL )// nCoeff_is_algExt(r->cf))
+    {
       rDecomposeCF(&(L->m[0]), r->cf->extRing, r);
     }

Singular/subexpr.cc

@@ -1483 +1483 @@
         return;
       }
-      if(rField_is_Extension(currRing)&&((vnr=r_IsRingVar(id, currRing->cf->extRing))>=0))
+      if((currRing->cf->extRing!=NULL)
+      &&((vnr=r_IsRingVar(id, currRing->cf->extRing))>=0))
       {
         BOOLEAN ok=FALSE;

libpolys/polys/clapsing.cc

@@ -119 +119 @@
   }
   // and over Q(a) / Fp(a)
-  else if ( rField_is_Extension(r))
+  else if ( r->cf->extRing!=NULL )
   {
     if ( rField_is_Q_a(r)) setCharacteristic( 0 );
@@ -175 +175 @@
   }
   // and over Q(a) / Fp(a)
-  else if ( rField_is_Extension(r))
+  else if ( r->cf->extRing )
   {
     if ( rField_is_Q_a(r)) setCharacteristic( 0 );
@@ -270 +270 @@
   }
   // and over Q(a) / Fp(a)
-  else if (rField_is_Extension(r))
+  else if (r->cf->extRing!=NULL)
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
@@ -416 +416 @@
   }
   // and over Q(a) / Fp(a)
-  else if ( rField_is_Extension(r))
+  else if ( r->cf->extRing!=NULL )
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
@@ -485 +485 @@
     res = convFactoryPSingP( F / G,r );
   }
-  else if (rField_is_Extension(r))
+  else if (r->cf->extRing!=NULL)
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
@@ -635 +635 @@
       FAC=convSingPFactoryP( fac,r );
     }
-    else if (rField_is_Extension(r))
+    else if (r->cf->extRing!=NULL)
     {
       if (r->cf->extRing->qideal!=NULL)
@@ -668 +668 @@
           q = convFactoryPSingP( Q,r );
         }
-        else if (rField_is_Extension(r))
+        else if (r->cf->extRing!=NULL)
         {
           if (r->cf->extRing->qideal!=NULL)
@@ -836 +836 @@
   }
   // and over Q(a) / Fp(a)
-  else if (rField_is_Extension(r))
+  else if (r->cf->extRing!=NULL)
   {
     if (rField_is_Q_a (r)) setCharacteristic (0);
@@ -898 +898 @@
         res->m[j] = convFactoryGFSingGF( J.getItem().factor() );
 #endif
-      else if (rField_is_Extension(r))     /* Q(a), Fp(a) */
+      else if (r->cf->extRing!=NULL)     /* Q(a), Fp(a) */
       {
 #ifndef NDEBUG
@@ -933 +933 @@
     }
 #ifndef NDEBUG
-    if (rField_is_Extension(r) && (!p_IsConstantPoly(ff,r)))
+    if ((r->cf->extRing!=NULL) && (!p_IsConstantPoly(ff,r)))
     {
       singclap_factorize_retry++;
@@ -1207 +1207 @@
     L = sqrFree( F );
   }
-  else if (rField_is_Extension(r))
+  else if (r->cf->extRing!=NULL)
   {
     if (rField_is_Q_a (r)) setCharacteristic (0);
@@ -1271 +1271 @@
       if (rField_is_Zp(r) || rField_is_Q(r))
         res->m[j] = convFactoryPSingP( J.getItem().factor(),r );
-      else if (rField_is_Extension(r))     /* Q(a), Fp(a) */
+      else if (r->cf->extRing!=NULL)     /* Q(a), Fp(a) */
       {
         if (r->cf->extRing->qideal==NULL)

libpolys/polys/monomials/p_polys.cc

@@ -3618 +3618 @@
 
   assume( !nCoeff_is_GF(srcCf) );
-  assume( rField_is_Extension(src) );
+  assume( src->cf->extRing!=NULL );
 
   poly zz = NULL;

libpolys/polys/monomials/ring.cc

@@ -3397 +3397 @@
 
   // set intStrategy
+  if ( (r->cf->extRing!=NULL)
+      || rField_is_Q(r)
 #ifdef HAVE_RINGS
-  if (
-         rField_is_Extension(r)
-      || rField_is_Q(r)
-      || rField_is_Ring(r))
-#else
-  if (rField_is_Extension(r) || rField_is_Q(r))
-#endif
+      || rField_is_Ring(r)
+#endif
+  )
     r->options |= Sy_bit(OPT_INTSTRATEGY);
   else
@@ -3410 +3408 @@
 
   // set redTail
-  if (r->LexOrder || r->OrdSgn == -1 || rField_is_Extension(r))
+  if (r->LexOrder || r->OrdSgn == -1 || (r->cf->extRing!=NULL))
     r->options &= ~Sy_bit(OPT_REDTAIL);
   else

libpolys/polys/monomials/ring.h

@@ -493 +493 @@
 static inline BOOLEAN rField_has_simple_Alloc(const ring r)
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_has_simple_Alloc(r->cf); }
-
-/// Alg. or trans. ext.
-static inline BOOLEAN rField_is_Extension(const ring r)
-{ assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_Extension(r->cf); } /* Z/p(a) and Q(a)*/
 
 n_coeffType rFieldType(const ring r);
@@ -646 +642 @@
   const coeffs C = r->cf;
   assume(C != NULL);
-//  assume( (rParameter(r)!=NULL) == rField_is_Extension(r) ); // ?
   return nCoeff_is_Extension(C) || nCoeff_is_GF(C) || nCoeff_is_long_C(C);
 }

libpolys/tests/polys_test.h

@@ -2047 +2047 @@
     TS_ASSERT( !rField_is_Zp(s, 13) );
     TS_ASSERT( !rField_is_GF(s) );
-    TS_ASSERT( rField_is_Extension(s) );
+    TS_ASSERT( (s->cf->extRing!=NULL) );
     TS_ASSERT( !rField_is_GF(s, 25) );
     TS_ASSERT_EQUALS(rVar(s), 2);
@@ -2148 +2148 @@
     TS_ASSERT( !rField_is_Zp(s, 13) );
     TS_ASSERT( !rField_is_GF(s) );
-    TS_ASSERT( rField_is_Extension(s) );
+    TS_ASSERT( (s->cf->extRing!=NULL) );
     TS_ASSERT( !rField_is_GF(s, 25) );
     TS_ASSERT_EQUALS(rVar(s), 3);
@@ -2293 +2293 @@
     TS_ASSERT( !rField_is_Zp(s, 17) );
     TS_ASSERT( !rField_is_GF(s) );
-    TS_ASSERT( rField_is_Extension(s) );
+    TS_ASSERT( (s->cf->extRing!=NULL) );
     TS_ASSERT( !rField_is_GF(s, 25) );
     TS_ASSERT_EQUALS(rVar(s), 3);
@@ -2366 +2366 @@
     TS_ASSERT( !rField_is_Zp(s, 17) );
     TS_ASSERT( !rField_is_GF(s) );
-    TS_ASSERT( rField_is_Extension(s) );
+    TS_ASSERT( (s->cf->extRing!=NULL) );
     TS_ASSERT( !rField_is_GF(s, 25) );
     TS_ASSERT_EQUALS(rVar(s), 3);
@@ -2479 +2479 @@
     TS_ASSERT( !rField_is_Zp(s, 17) );
     TS_ASSERT( !rField_is_GF(s) );
-    TS_ASSERT( rField_is_Extension(s) );
+    TS_ASSERT( (s->cf->extRing!=NULL) );
     TS_ASSERT( !rField_is_GF(s, 25) );
     TS_ASSERT_EQUALS(rVar(s), 1);
@@ -2590 +2590 @@
     TS_ASSERT( !rField_is_Zp(s, 17) );
     TS_ASSERT( !rField_is_GF(s) );
-    TS_ASSERT( rField_is_Extension(s) );
+    TS_ASSERT( (s->cf->extRing!=NULL) );
     TS_ASSERT( !rField_is_GF(s, 25) );
     TS_ASSERT_EQUALS(rVar(s), 3);