Changeset be0d84 in git for Singular/mpsr_PutPoly.cc

Timestamp:

Mar 8, 1999, 6:30:53 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

17e692576cbeb0b918e77a2b33f3d8bac726d8fe

Parents:

55683a9a29c191728a4980caaffdc14fdfbe2a9d

Message:

* hannes: access to coeff-description via functions (1. approach)


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

File:

• Singular/mpsr_PutPoly.cc (modified) (11 diffs)

Singular/mpsr_PutPoly.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_PutPoly.cc,v 1.13 1998-11-13 12:21:00 obachman Exp $ */
+/* $Id: mpsr_PutPoly.cc,v 1.14 1999-03-08 17:30:48 Singular Exp $ */
 
 /***************************************************************
@@ -24 +24 @@
 #include "longalg.h"
 #include "mmemory.h"
-#include "ring.h"
 #include "polys.h"
 #include "ipid.h"
@@ -91 +90 @@
   mpsr_InitTempArray(gNvars+1);
 
-  if ((r->ch) == 0)
+  if (rField_is_Q(r))
     // rational numbers
     PutCoeff= PutRationalNumber;
-  else if ((r->ch) > 1)
+  else if (rField_is_Zp(r))
     // Form our point of view, ModuloP numbers and numbers from
     // GF(p,n) are the same, here. They only differ in the annots
     PutCoeff = PutModuloNumber;
-  else if ((r->ch) == -1)
+  else if (rField_is_R(r))
     PutCoeff = PutFloatNumber;
   else
@@ -106 +105 @@
     mpsr_InitTempArray(gNalgvars);
     PutCoeff = PutAlgNumber;
-    if ((r->ch) < 0)
+    if (rField_is_Zp_a(r))
       // first, Z/p(a)
       PutAlgAlgNumber = PutModuloNumber;
@@ -346 +345 @@
   // Hmm .. this is not according to a "proper" Singular ring,
   // but to be used in a recursive call of mpsr_PutRingAnnots
-  if (r->minpoly != NULL && r->parameter == NULL && r->ch > 0)
+  if (r->minpoly != NULL && r->parameter == NULL
+  && (rField_is_Q_a(r)||rField_is_GF(r)))
     failr(PutMinPolyAnnot(link,r));
   
@@ -371 +371 @@
 
   // First element is the coefficient
-  if ((r->ch) == 0)
+  if (rField_is_Q(r))
   {
     // rational numbers
@@ -384 +384 @@
                                     0));
   }
-  else if ((r->ch) > 1)
+  else if (rField_is_Zp(r))
   {
     // modulo p numbers
@@ -398 +398 @@
                                     MP_AnnotValuated));
     // with Modulo
-    mp_failr(MP_PutUint32Packet(link, r->ch, 1));
+    mp_failr(MP_PutUint32Packet(link, rChar(r), 1));
     if (r->parameter == NULL)
     {
@@ -416 +416 @@
     }
   }
-  else if ((r->ch) == -1)
+  else if (rField_is_R(r))
   {
     // floats 
@@ -431 +431 @@
 
     alg_r->N = rPar(r);
-    alg_r->ch = (r->ch < 0 ? - (r->ch) : 0);
+    alg_r->ch = rChar(r);
     alg_r->order = (int *) Alloc(3*sizeof(int));
     alg_r->order[2] = ringorder_no;
@@ -683 +683 @@
   // need to set PutAlgAlgnumber and gNalgVars
   CurrPutRing = r;
-  if (r->ch > 0)
+  if (rField_is_Zp(r)) // orig: (r->ch > 0) ???
     PutAlgAlgNumber = PutModuloNumber;
   else