Changeset 50ba1c in git

Timestamp:

Feb 7, 2003, 1:34:28 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

95930acb167fc2d0e05cac9ce06382d9a5f95d6e

Parents:

aa91e745636b8feeb5554122c2fc630f9608af47

Message:

*hannes: rFiled tests


git-svn-id: file:///usr/local/Singular/svn/trunk@6486 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ring.cc (modified) (3 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.199 2003-01-31 09:23:39 Singular Exp $ */
+/* $Id: ring.cc,v 1.200 2003-02-07 12:34:02 Singular Exp $ */
 
 /*
@@ -1176 +1176 @@
 }
 
+int  rIsExtension(ring r)
+{
+  return (r->parameter!=NULL); /* R, Q, Fp: FALSE */
+}
+
+int  rIsExtension()
+{
+  return rIsExtension( currRing );
+} 
+
 int rChar(ring r)
 {
-  if (r->ch==-1)
+  if (rField_is_numeric(r))
     return 0;
-  if (r->parameter==NULL) /* Q, Fp */
+  if (!rIsExtension(r)) /* Q, Fp */
     return r->ch;
-  if (r->ch<0)           /* Fp(a)  */
+  if (rField_is_Zp_a(r))  /* Fp(a)  */
     return -r->ch;
-  if (r->ch==1)          /* Q(a)  */
+  if (rField_is_Q_a(r))   /* Q(a)  */
     return 0;
   /*else*/               /* GF(p,n) */
@@ -1193 +1203 @@
     return i;
   }
-}
-
-int    rIsExtension(ring r)
-{
-  if (r->parameter==NULL) /* Q, Fp */
-    return FALSE;
-  else
-    return TRUE;
-}
-
-int    rIsExtension()
-{
-  return rIsExtension( currRing );
 }