Changeset 6de26a0 in git

Timestamp:

Jul 1, 1999, 6:40:44 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

18da0509aef489d7aa4c155ecff111bb28e3a08f

Parents:

144103de02ee0c19024af184f445e68a619fbc67

Message:

*hannes: rField*


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

Location:

Singular

Files:

• ring.cc (modified) (2 diffs)
• ring.h (modified) (3 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.55 1999-07-01 16:13:41 Singular Exp $ */
+/* $Id: ring.cc,v 1.56 1999-07-01 16:40:42 Singular Exp $ */
 
 /*
@@ -38 +38 @@
 
 /*0 implementation*/
-BOOLEAN rField_is_R(ring r=currRing)
-{
-  return ((r->ch == -1) && (r->ch_flags==0));
-}
+//BOOLEAN rField_is_R(ring r=currRing)
+//{
+//  if (r->ch== -1)
+//  {
+//    if (r->ch_flags==(short)0) return TRUE;
+//  }
+//  return FALSE;
+//}
 
 int rBlocks(ring r)

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.27 1999-07-01 16:13:42 Singular Exp $ */
+/* $Id: ring.h,v 1.28 1999-07-01 16:40:44 Singular Exp $ */
 
 /* includes */
@@ -58 +58 @@
 inline BOOLEAN rField_is_Q(ring r=currRing)
 { return (r->ch == 0) && (r->parameter==NULL); }
-BOOLEAN rField_is_R(ring r=currRing);
+inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
+{ return (r->ch ==  -1); }
+inline BOOLEAN rField_is_R(ring r=currRing)
+{
+  if (rField_is_numeric(r) && (r->ch_flags == (short)0)) return TRUE;
+  return FALSE;
+}
 inline BOOLEAN rField_is_GF(ring r=currRing)
 { return (r->ch > 1) && (r->parameter!=NULL); }
@@ -68 +74 @@
 { return (r->ch == 1); }
 inline BOOLEAN rField_is_long_R(ring r=currRing)
-{ return (r->ch == -1) && (r->ch_flags!=0) &&(r->parameter==NULL); }
+{
+  if (rField_is_numeric(r) && (r->ch_flags != (short)0))
+    return (r->parameter==NULL);
+  return FALSE;
+}
 inline BOOLEAN rField_is_long_C(ring r=currRing)
-{ return (r->ch == -1) && (r->ch_flags!=0) &&(r->parameter!=NULL); }
+{
+  if (rField_is_numeric(r) && (r->ch_flags != (short)0))
+    return (r->parameter!=NULL);
+  return FALSE;
+}
 inline BOOLEAN rField_has_simple_inverse(ring r=currRing)
 { return (r->ch>1) || (r->ch== -1); } /* Z/p, GF(p,n), R, long_R, long_C*/