Changeset b719a3 in git

Timestamp:

Jul 8, 1999, 3:38:44 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

2082b6153c70d5e5b989c2d74d656bd2e080a3c7

Parents:

da408fe6b31ced4ed0febcceb258e7a27064215a

Message:

*hannes: ring fixes: real + param.


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

Location:

Singular

Files:

• ring.cc (modified) (4 diffs)
• ring.h (modified) (5 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.56 1999-07-01 16:40:42 Singular Exp $ */
+/* $Id: ring.cc,v 1.57 1999-07-08 13:38:44 Singular Exp $ */
 
 /*
@@ -526 +526 @@
 
   /* characteristic -----------------------------------------------*/
-  /* input: 0 ch=0 : Q     parameter=NULL    ffChar=FALSE
+  /* input: 0 ch=0 : Q     parameter=NULL    ffChar=FALSE   ch_flags
    *         0    1 : Q(a,...)        *names         FALSE
-   *         0   -1 : R               NULL           FALSE
-   *         0   -1 : C               *names         FALSE
+   *         0   -1 : R               NULL           FALSE  0
+   *         0   -1 : R               NULL           FALSE  prec. >6
+   *         0   -1 : C               *names         FALSE  prec. 0..?
    *         p    p : Fp              NULL           FALSE
    *         p   -p : Fp(a)           *names         FALSE
@@ -591 +592 @@
     goto rInitError;
   }
+  /* post-processing of field description */
+  // we have short reals, but no short complex
+  if ((R->ch == - 1)
+  && (R->parameter !=NULL)
+  && (R->ch_flags < SHORT_REAL_LENGTH))
+    R->ch_flags = SHORT_REAL_LENGTH;
 
   /* names and number of variables-------------------------------------*/
@@ -733 +740 @@
       }
       PrintS("\n//   minpoly        : ");
-      if (r->minpoly==NULL)
+      if ( rField_is_long_C(r) )
+      {
+        // i^2+1:
+        Print("(%s^2+1)\n",r->parameter[0]);
+      }
+      else if (r->minpoly==NULL)
       {
         PrintS("0\n");

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.28 1999-07-01 16:40:44 Singular Exp $ */
+/* $Id: ring.h,v 1.29 1999-07-08 13:38:42 Singular Exp $ */
 
 /* includes */
 #include "structs.h"
 #include "polys-impl.h"
+
+#define SHORT_REAL_LENGTH 6 // use short reals for real <= 6 digits
+
 
 #ifdef DRING
@@ -62 +65 @@
 inline BOOLEAN rField_is_R(ring r=currRing)
 {
-  if (rField_is_numeric(r) && (r->ch_flags == (short)0)) return TRUE;
+  if (rField_is_numeric(r) && (r->ch_flags <= (short)SHORT_REAL_LENGTH))
+    return (r->parameter==NULL);
   return FALSE;
 }
@@ -75 +79 @@
 inline BOOLEAN rField_is_long_R(ring r=currRing)
 {
-  if (rField_is_numeric(r) && (r->ch_flags != (short)0))
+  if (rField_is_numeric(r) && (r->ch_flags >(short)SHORT_REAL_LENGTH))
     return (r->parameter==NULL);
   return FALSE;
@@ -81 +85 @@
 inline BOOLEAN rField_is_long_C(ring r=currRing)
 {
-  if (rField_is_numeric(r) && (r->ch_flags != (short)0))
+  if (rField_is_numeric(r))
     return (r->parameter!=NULL);
   return FALSE;
@@ -121 +125 @@
   rOrderType_Schreyer,     // Schreyer ordering
   rOrderType_Syz2dpc,     // syzcomp2dpc
-  rOrderType_ExpNoComp    // simple ordering, differences in component are 
+  rOrderType_ExpNoComp    // simple ordering, differences in component are
                           // not considered
 } rOrderType_t;