Changeset c56a23 in git

Timestamp:

Mar 12, 1999, 1:05:24 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0a8363710624cb96eb31b5c8f73c2a20d42f0c18

Parents:

0d75846d805790817debe506ec114af12ae711b4

Message:

*hannes: fixes to mpsr_PutPoly/ new field tests


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

File:

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

Singular/mpsr_PutPoly.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_PutPoly.cc,v 1.14 1999-03-08 17:30:48 Singular Exp $ */
+/* $Id: mpsr_PutPoly.cc,v 1.15 1999-03-12 12:05:24 Singular Exp $ */
 
 /***************************************************************
@@ -24 +24 @@
 #include "longalg.h"
 #include "mmemory.h"
+#include "ring.h"
 #include "polys.h"
 #include "ipid.h"
@@ -93 +94 @@
     // rational numbers
     PutCoeff= PutRationalNumber;
-  else if (rField_is_Zp(r))
+  else if (rField_is_Zp(r) || rField_is_GF(r))
     // Form our point of view, ModuloP numbers and numbers from
     // GF(p,n) are the same, here. They only differ in the annots
@@ -345 +346 @@
   // 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
-  && (rField_is_Q_a(r)||rField_is_GF(r)))
+  if (r->minpoly != NULL && r->parameter == NULL && r->ch > 0)
     failr(PutMinPolyAnnot(link,r));
   
@@ -384 +384 @@
                                     0));
   }
-  else if (rField_is_Zp(r))
+  else if (rField_is_Zp(r) || rField_is_GF(r))
   {
     // modulo p numbers
@@ -398 +398 @@
                                     MP_AnnotValuated));
     // with Modulo
-    mp_failr(MP_PutUint32Packet(link, rChar(r), 1));
+    mp_failr(MP_PutUint32Packet(link, rInternalChar(r), 1));
     if (r->parameter == NULL)
     {
@@ -683 +683 @@
   // need to set PutAlgAlgnumber and gNalgVars
   CurrPutRing = r;
-  if (rField_is_Zp(r)) // orig: (r->ch > 0) ???
+  if (rField_is_Zp(r) || rField_is_GF(r))
     PutAlgAlgNumber = PutModuloNumber;
   else