Changeset 126cfa in git

Timestamp:

May 4, 1997, 1:11:54 PM (27 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0bbd0edd89d414dafebcc5580e22fe46da78612c

Parents:

1eed4ee3e5d96c4420bb542d28e2fe2f8facab45

Message:

Sun May  4 11:14:44 1997  Olaf Bachmann
<obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>

	* Added make target mpcheck; Update INSTALL file

	* mpsr_PutPoly.cc (PutRationalNumber): Normalize if number->s == 0
	  and not if number->s == 2

	* mpsr_GetPoly.cc (GetGaloisNumber): Introduced special routines,
	  since npInit op in GetModuloNumber messed things up


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

Location:

Singular

Files:

• ChangeLog (modified) (2 diffs)
• INSTALL (modified) (2 diffs)
• Makefile.in (modified) (4 diffs)
• configure (modified) (57 diffs)
• configure.in (modified) (2 diffs)
• mpsr_GetPoly.cc (modified) (4 diffs)
• mpsr_PutPoly.cc (modified) (2 diffs)

Singular/ChangeLog

@@ +1 @@
+Sun May  4 11:14:44 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
+
+        * Added make target mpcheck; Update INSTALL file
+
+        * mpsr_PutPoly.cc (PutRationalNumber): Normalize if number->s == 0
+          and not if number->s == 2
+
+        * mpsr_GetPoly.cc (GetGaloisNumber): Introduced special routines,
+          since npInit op in GetModuloNumber messed things up
+
 Sat May  3 00:07:55 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
+
+        * Makefile.in (CPPFLAGS): put -I. before other CPPFLAGS
 
         * febase.cc (feFopen): fixed bug in opening library from
@@ -7 +19 @@
         * small mpsr Changes to reflect some name changes of MP Dicts
 
-        * configure.in Makefile.in: new schem for updating Makefile mod2.h
+        * configure.in Makefile.in: new scheme for updating Makefile mod2.h
           based on time-stamps 
 

Singular/INSTALL

@@ -68 +68 @@
      with the distribution.
 
-  6. Other make targets are:
+  6. Other make targets include:
      'dist'      : Creates a distribution of all source files of
                    Singular.
@@ -79 +79 @@
                    target created (i.e. Singular's executable program,
                    Singular's info file, and Singular's libraries)
+     'check'     : Tests basic Singular functionality
 
 Compilers and Options

Singular/Makefile.in

@@ -46 +46 @@
 CXXFLAGS        = @CXXFLAGS@
 CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@
-CPPFLAGS        = @CPPFLAGS@ -I${srcdir}
+CPPFLAGS        = -I${srcdir} @CPPFLAGS@ 
 DEFS            = @DEFS@ -DNDEBUG
 LDFLAGS         = @LDFLAGS@
@@ -54 +54 @@
 ## subdirectories
 ##
-docdir          = doc   # where the doumentation files are
-testsdir        = tests # where the tests files are 
+# where the doumentation files are
+docdir          = doc
+# where the tests files are 
+testdir         = tests
 
 ##
@@ -224 +226 @@
 
 clean:
-        -rm -rf Singular* *.o *.og core *.d *.dd *~ \#* ${testdir}/out
+        -rm -rf Singular* *.o *.og core *.d *.dd *~ \#* /tmp/mp*
+        cd ${testdir} rm -f out.got *dump* 
         cd ${docdir}; ${MAKE} clean
 
@@ -241 +244 @@
         cd ${docdir}; ${MAKE} $@
 
-check:  Singular ${testdir}/check ${testdir}/output
+check:  Singular ${testdir}/check ${testdir}/out.should
         cd ${testdir}; SINGULARPATH=./../LIB/ ./check ./../Singular
+        if test -n "@HAVE_MPSR@"; then echo; ${MAKE} mpcheck; fi
+
+mpcheck: Singular ${testdir}/mpcheck ${testdir}/mpcheck.data
+        cd ${testdir}; ./mpcheck `pwd`/.. mpcheck.data
 
 ##

Singular/configure

@@ -1764 +1764 @@
 
       NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
+      HAVE_MPSR=HAVE_MP
     elif test "$enable_MP" = yes; then
       cat >> confdefs.h <<\EOF
@@ -1770 +1771 @@
 
       NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
+      HAVE_MPSR=HAVE_MP
       echo "configure: warning: install MP before making Singular or configure --without-MP" 1>&2
     else
@@ -1776 +1778 @@
   fi
 fi
+
 
 if test "$with_factory" != no; then
@@ -1790 +1793 @@
 LIBS="-lsingcf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1793 "configure"
+#line 1796 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1800 +1803 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1833 +1836 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1836 "configure"
+#line 1839 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1897 +1900 @@
 LIBS="-lsinglibfac  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1900 "configure"
+#line 1903 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1907 +1910 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1940 +1943 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1943 "configure"
+#line 1946 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2001 +2004 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2004 "configure"
+#line 2007 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-{ (eval echo configure:2008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_c_cross=no
@@ -2023 +2026 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2026 "configure"
+#line 2029 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2031 +2034 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2046 +2049 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2049 "configure"
+#line 2052 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -2064 +2067 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2067 "configure"
+#line 2070 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2085 +2088 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2088 "configure"
+#line 2091 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -2096 +2099 @@
 
 EOF
-{ (eval echo configure:2099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   :
@@ -2124 +2127 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2127 "configure"
+#line 2130 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2163 +2166 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2166 "configure"
+#line 2169 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2198 +2201 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2201 "configure"
+#line 2204 "configure"
 #include "confdefs.h"
 
@@ -2248 +2251 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -2274 +2277 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2277 "configure"
+#line 2280 "configure"
 #include "confdefs.h"
 
@@ -2282 +2285 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -2310 +2313 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2313 "configure"
+#line 2316 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2341 +2344 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2344 "configure"
+#line 2347 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2351 +2354 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
@@ -2375 +2378 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2378 "configure"
+#line 2381 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2384 +2387 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
@@ -2411 +2414 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2414 "configure"
+#line 2417 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -2419 +2422 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
@@ -2443 +2446 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2446 "configure"
+#line 2449 "configure"
 #include "confdefs.h"
 
@@ -2467 +2470 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   ac_cv_func_alloca=yes
@@ -2502 +2505 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2505 "configure"
+#line 2508 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -2531 +2534 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2534 "configure"
+#line 2537 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2553 +2556 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2585 +2588 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2588 "configure"
+#line 2591 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -2604 +2607 @@
 }
 EOF
-{ (eval echo configure:2607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_c_stack_direction=1
@@ -2628 +2631 @@
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 2631 "configure"
+#line 2634 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
@@ -2646 +2649 @@
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 2649 "configure"
+#line 2652 "configure"
 #include "confdefs.h"
 #include <termio.h>
@@ -2674 +2677 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2677 "configure"
+#line 2680 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2696 +2699 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2726 +2729 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2729 "configure"
+#line 2732 "configure"
 #include "confdefs.h"
 
@@ -2795 +2798 @@
 
 EOF
-{ (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_func_mmap=yes
@@ -2818 +2821 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2821 "configure"
+#line 2824 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2836 +2839 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
@@ -2858 +2861 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2861 "configure"
+#line 2864 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2880 +2883 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
@@ -2906 +2909 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2909 "configure"
+#line 2912 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2928 +2931 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
@@ -2957 +2960 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2960 "configure"
+#line 2963 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2979 +2982 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -3011 +3014 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 3014 "configure"
+#line 3017 "configure"
 #include "confdefs.h"
  int main() { if (-2 >> 1 == -1) exit(0); else exit(1); } 
 EOF
-{ (eval echo configure:3018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_shift=yes
@@ -3041 +3044 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 3044 "configure"
+#line 3047 "configure"
 #include "confdefs.h"
  int main() {if (sizeof(int) == 4)  exit(0); else exit(1); } 
 EOF
-{ (eval echo configure:3048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_int_equals_four=yes
@@ -3071 +3074 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 3074 "configure"
+#line 3077 "configure"
 #include "confdefs.h"
  int main() {if (sizeof(long) == sizeof(void*))  exit(0); else exit(1); }
 EOF
-{ (eval echo configure:3078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:3081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_long_equals_voidp=yes
@@ -3100 +3103 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 3103 "configure"
+#line 3106 "configure"
 #include "confdefs.h"
 #include <stdio.h> 
  main() { char *str=(char*)malloc(20); if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
 EOF
-{ (eval echo configure:3108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:3111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_returns_n_of_chars=yes
@@ -3133 +3136 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 3136 "configure"
+#line 3139 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3144 +3147 @@
 }
 EOF
-{ (eval echo configure:3147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_voidp=`cat conftestval`
@@ -3302 +3305 @@
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
+s%@HAVE_MPSR@%$HAVE_MPSR%g
 s%@NEED_LIBS@%$NEED_LIBS%g
 s%@ALLOCA@%$ALLOCA%g

Singular/configure.in

@@ -220 +220 @@
       AC_DEFINE(HAVE_MPSR)
       NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
+      HAVE_MPSR=HAVE_MP
     elif test "$enable_MP" = yes; then
       AC_DEFINE(HAVE_MPSR)
       NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
+      HAVE_MPSR=HAVE_MP
       AC_MSG_WARN(install MP before making Singular or configure --without-MP)
     else
@@ -229 +231 @@
   fi
 fi
+AC_SUBST(HAVE_MPSR)
 
 dnl Check factory

Singular/mpsr_GetPoly.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_GetPoly.cc,v 1.6 1997-05-02 22:09:27 obachman Exp $ */
+/* $Id: mpsr_GetPoly.cc,v 1.7 1997-05-04 11:11:53 obachman Exp $ */
 
 /***************************************************************
@@ -74 +74 @@
 static void        SetGetFuncs(ring r);
 static mpsr_Status_t GetModuloNumber(MP_Link_pt link, number *a);
+static mpsr_Status_t GetGaloisNumber(MP_Link_pt link, number *a);
 static mpsr_Status_t GetFloatNumber(MP_Link_pt link, number *a);
 static mpsr_Status_t GetApInt(MP_Link_pt link, mpz_ptr ap);
@@ -118 +119 @@
     GetCoeff = GetRationalNumber;
   else if ((r->ch) > 1)
-    // Form our point of view, ModuloP numbers and numbers from
-    // GF(p,n) are the same, here. They only differ in the annots
-    GetCoeff = GetModuloNumber;
+  {
+    if (r->parameter == NULL)
+      GetCoeff = GetModuloNumber;
+    else
+      GetCoeff = GetGaloisNumber;
+  }
   else if ((r->ch) == -1)
     GetCoeff = GetFloatNumber;
@@ -154 +158 @@
   *a=npInit((int)x);
   return mpsr_Success;
+}
+
+static mpsr_Status_t GetGaloisNumber(MP_Link_pt link, number *a)
+{
+  mp_return(IMP_GetUint32(link, (MP_Uint32_t *) a));
 }
 

Singular/mpsr_PutPoly.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_PutPoly.cc,v 1.6 1997-05-02 22:09:29 obachman Exp $ */
+/* $Id: mpsr_PutPoly.cc,v 1.7 1997-05-04 11:11:54 obachman Exp $ */
 
 /***************************************************************
@@ -161 +161 @@
   // Now we have a fraction
   // normalize, if necessary
-  if ((a->s) == 2)
+  if ((a->s) == 0)
+  {
     nlNormalize(a);
+    return PutRationalNumber(link, a);
+  }
+  
   // send number itself
   mp_failr(MP_PutCommonOperatorPacket(link,