Changeset 2f436b in git

Timestamp:

Dec 31, 2000, 4:14:47 PM (22 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

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

Children:

e609098c45a74ac91c002ffa7ece5eebe7f8c002

Parents:

33ec1145a109507ad3e3cf4a69a847b703358e93

Message:

* version 1-3-13: sparsemat improivements


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

Location:

Singular

Files:

• LIB/general.lib (modified) (6 diffs)
• LIB/poly.lib (modified) (3 diffs)
• LIB/tst.lib (modified) (7 diffs)
• Makefile.in (modified) (8 diffs)
• configure (modified) (138 diffs)
• configure.in (modified) (1 diff)
• dError.c (modified) (2 diffs)
• dError.h (modified) (2 diffs)
• ideals.cc (modified) (4 diffs)
• iparith.cc (modified) (3 diffs)
• kInline.cc (modified) (4 diffs)
• kbuckets.cc (modified) (5 diffs)
• kbuckets.h (modified) (5 diffs)
• kstd1.cc (modified) (6 diffs)
• kutil.cc (modified) (2 diffs)
• kutil.h (modified) (2 diffs)
• longalg.cc (modified) (3 diffs)
• matpol.cc (modified) (2 diffs)
• mpr_numeric.cc (modified) (2 diffs)
• mpsr_Get.cc (modified) (6 diffs)
• pInline0.h (modified) (4 diffs)
• pInline1.h (modified) (2 diffs)
• pInline2.h (modified) (10 diffs)
• p_MemCmp.h (modified) (2 diffs)
• p_Merge_q__Template.cc (modified) (2 diffs)
• p_Mult_q.cc (modified) (3 diffs)
• p_Mult_q.h (added)
• p_Procs.h (modified) (3 diffs)
• p_Procs_Dynamic.cc (modified) (3 diffs)
• p_Procs_Generate.cc (modified) (4 diffs)
• p_Procs_Impl.h (modified) (6 diffs)
• p_Procs_Set.h (modified) (3 diffs)
• p_Procs_Static.cc (modified) (2 diffs)
• p_polys.h (modified) (6 diffs)
• polys.cc (modified) (4 diffs)
• polys.h (modified) (5 diffs)
• polys1.cc (modified) (4 diffs)
• pp_Mult_Coeff_mm_DivSelectMult__Template.cc (added)
• pp_Mult_Coeff_mm_DivSelect__Template.cc (modified) (5 diffs)
• prCopy.cc (modified) (3 diffs)
• prCopy.h (modified) (4 diffs)
• prCopyMacros.h (modified) (1 diff)
• ring.cc (modified) (2 diffs)
• ring.h (modified) (2 diffs)
• sparsmat.cc (modified) (18 diffs)
• structs.h (modified) (3 diffs)
• syz0.cc (modified) (2 diffs)

Singular/LIB/general.lib

@@ -2 +2 @@
 //anne, added deleteSublist and watchdog 12.12.2000
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: general.lib,v 1.33 2000-12-30 03:00:57 greuel Exp $";
+version="$Id: general.lib,v 1.34 2000-12-31 15:14:46 obachman Exp $";
 category="General purpose";
 info="
@@ -271 +271 @@
 EXAMPLE:  example factorial; shows an example
 "
-{   int str,l,p;
+{   int l,p;
 //---------------------------- initialization -------------------------------
    if ( size(#) == 0 )
-   {  str = 1;
+   {  
       ring bin = 0,x,dp;
       number r=1;
@@ -284 +284 @@
       {
          if ( p == char(basering) )
-         {  number r=1;
+         {
+           // do it clever !
+           if (n < 1) {return (0);}
+           if (! defined(sv_factorials))
+           {
+             ideal sv_factorials;
+             sv_factorials[1] = 1;
+             export(sv_factorials);
+           }
+           if (n > size(sv_factorials))
+           {
+             int i = size(sv_factorials);
+             sv_factorials[n] = 0;
+             number fi = number(sv_factorials[i]);
+             for (i++;i<=n;i++)
+             {
+               fi = fi * i;
+               sv_factorials[i] = fi;
+             }
+             return (fi);
+           }
+           else
+           {
+             return (number(sv_factorials[n]));
+           }
          }
          else
-         {  str = 1;
+         {  
             ring bin = p,x,dp;
             number r=1;
@@ -293 +317 @@
       }
       else
-      {  str = 1;
+      {  
          ring bin = p,x,dp;
          number r=1;
@@ -303 +327 @@
       r=r*l;
    }
-   if ( str==1 ) { return(string(r)); }
-   else { return(r); }
+   return(string(r));
 }
 example
@@ -313 +336 @@
    p;
 }
+    
+        
 ///////////////////////////////////////////////////////////////////////////////
 

Singular/LIB/poly.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: poly.lib,v 1.30 2000-12-31 01:55:11 greuel Exp $";
+version="$Id: poly.lib,v 1.31 2000-12-31 15:14:47 obachman Exp $";
 category="General purpose";
 info="
@@ -752 +752 @@
 {
   poly p = cleardenom(n+var(1));
-  return (coeffs(p,var(1))[1,1]);
+  return (number(coeffs(p,var(1))[1,1]));
 }
 example
@@ -771 +771 @@
 {
   poly p = cleardenom(n+var(1));
-  return (coeffs(p,var(1))[2,1]);
+  return (number(coeffs(p,var(1))[2,1]));
 }
 example

Singular/LIB/tst.lib

@@ -1 @@
-// $Id: tst.lib,v 1.30 2000-12-22 15:05:57 greuel Exp $
+// $Id: tst.lib,v 1.31 2000-12-31 15:14:47 obachman Exp $
 //(obachman, last modified 6/30/98)
 /////////////////////////////////////////////////////////////////////////////
 
-version="$Id: tst.lib,v 1.30 2000-12-22 15:05:57 greuel Exp $";
+version="$Id: tst.lib,v 1.31 2000-12-31 15:14:47 obachman Exp $";
 category="Utilities";
 info="
@@ -14 +14 @@
  tst_init()             writes some identification data to GetTstStatusFile()
  tst_status([any])      writes status info to to GetTstStatusFile()
+ tst_InitTimer()        initialize tst-Timer
+ tst_StopTimer()        stop Tst-Timer
+ tst_GetTimer           get value of Tst-Timer
+ tst_ReportTimer        report value of Tst-Timer
  tst_groebnerTest(ideal i)
                         tests groebner command
@@ -186 +190 @@
 
 proc tst_status (list #)
-"USAGE:   tst_status([any])
-RETURN:   none; writes to stdout the current memory usage and used time
-          since last call to tst_status(), if no argument is given, or,
-          since start-up of Singular, if an argument is given.
+"USAGE:   tst_status([prefix [, start_up]])
+           prefix -- string
+           start_up -- int
+RETURN:   none
+PURPOSE: writes to tst-output the current memory usage and used CPU time.
+         If no integer argument is given, the elapsed CPU time since 
+         the last call to tst_status() is reported.
+         If an integer argument is given, the elapsed CPU time since the
+         start-up of Singular is reported.
+         If prefix is given, output reported start with prefix.
 NOTE:     Should be used regularly within tst files to enable automatic
           tracking of memory and time performance.
 EXAMPLE: example tst_status; shows example
+SEE ALSO: tst_init
 "
 {
+  int start_up;
+  
+  if (size(#) > 0)
+  {
+    if (typeof(#[1]) == "string")
+    {
+      string prefix = #[1];
+      if (size(#) > 1)
+      {
+        start_up = 1;
+      }
+    }
+    else
+    {
+      start_up = 1;
+    }
+  }
   if (! defined(tst_no_status))
   {
@@ -207 +235 @@
     }
 
-    tst_status_out(tst_status_counter, "tst_memory_0", memory(0));
-    tst_status_out(tst_status_counter, "tst_memory_1", memory(1));
-    tst_status_out(tst_status_counter, "tst_memory_2", memory(2));
-    if (size(#) > 0)
-    {
-      tst_status_out(tst_status_counter, "tst_timer_1", timer);
+    if (!defined(prefix))
+    {
+      def prefix = tst_status_counter;
+    }
+    tst_status_out(prefix, "tst_memory_0", memory(0));
+    tst_status_out(prefix, "tst_memory_1", memory(1));
+    tst_status_out(prefix, "tst_memory_2", memory(2));
+    if (start_up > 0)
+    {
+      tst_status_out(prefix, "tst_timer_1", timer);
     }
     else
     {
-      tst_status_out(tst_status_counter, "tst_timer", timer - Get_tst_timer());
+      tst_status_out(prefix, "tst_timer", timer - Get_tst_timer());
       Set_tst_timer(timer);
     }
@@ -232 +264 @@
 
 
-proc tst_init()
-"USAGE:   tst_init()
-RETURN:  none; writes some identification data to stdout;
-         should be called as first routine in a tst file
+proc tst_init(list #)
+"USAGE:   tst_init([file])
+            file -- string
+RETURN:  none
+PURPOSE: initializes further calls to tst routines:
+         If no arguments are given, and if tst_status_file is not defined,
+         then tst-output is written to stdout, else tst-output is written
+         to file.
 EXAMPLE: example tst_init; shows example
 "
@@ -241 +277 @@
   if (! defined(tst_no_status))
   {
-    write(":w " + GetTstStatusFile(), "Status Output of " + GetTstStatusFile());
+    string outfile = "";
+    
+    if (size(#) > 0)
+    {
+      if (typeof(#[1]) == string)
+      {
+        outfile  = #[1];
+      }
+    }
+    if (!defined(tst_status_file))
+    {
+      string tst_status_file = outfile;
+      export tst_status_file;
+    }
+    if (GetTstStatusFile() != "")
+    {
+      write(":w " + GetTstStatusFile(), "Status Output of " + GetTstStatusFile());
+    }
     tst_status_out("init", "USER    :" + system("getenv", "USER"));
     tst_status_out("init", "HOSTNAME:" + tst_system("hostname", 1));
@@ -255 +308 @@
   "EXAMPLE";  echo = 2;
   tst_init();
+}
+
+proc tst_InitTimer(list #)
+"USAGE: tst_InitTime([ticks_per_second])
+          ticks_per_second -- int
+RETURN: none
+PURPOSE: initializes tst timer for subsequent calls to tst_StopTimer or
+         tst_ReportTimer.
+         If the ticks_per_second argument is given, then the timer resolution
+         is set to this value. Otherwise, the default timer resolution is used.
+SEE ALSO: tst_StopTimer, tst_GetTimer, tst_ReportTimer
+"
+{
+  if (!defined(tst_Timer))
+  {
+    int tst_Timer;
+    export tst_Timer;
+  }
+  if (size(#) > 0)
+  {
+    if (typeof(#[1]) == "int")
+    {
+      if (#[1] > 0)
+      {
+        system("--ticks-per-sec", #[1]);
+      }
+      else
+      {
+        ERROR("need integer argument > 0");
+      }
+    }
+    else
+    {
+      ERROR("need integer argument");
+    }
+  }
+  tst_Timer = timer;
+}
+
+proc tst_StopTimer()
+"USAGE: tst_StopTimer()
+RETURN: int, timer ticks of elapsed CPU time since last call to tst_InitTimer
+PUPOSE: stops the timer initialized by previous call to tst_InitTimer
+SEE ALSO: tst_InitTimer, tst_GetTimer, tst_ReportTimer
+"
+{
+  tst_Timer = timer - tst_Timer;
+  return (tst_Timer);
+}
+
+proc tst_GetTimer()
+"USAGE: tst_GetTimer()
+RETURN: int, timer ticks of elapsed CPU time since last call to tst_Init
+NOTE:  does NOT stop the time initialized by previous call to tst_InitTimer
+SEE ALSO: tst_InitTimer, tst_GetTimer, tst_ReportTimer
+"
+{
+  int tt = timer - tst_Timer;
+  return (tt);
+}
+
+proc tst_ReportTimer(list #)
+"USAGE: tst_ReportTimer([prefix])
+RETURN: none
+PUPOSE: stops the timer initialized by previous call to tst_InitTimer;
+        reports time to tst-output;
+        if prefix is given, timer output is prefixed by it.
+SEE ALSO: tst_InitTimer, tst_GetTimer, tst_StopTimer, tst_OutTimer, tst_init
+"
+{
+  tst_Timer = timer - tst_Timer;
+  tst_OutTimer(tst_Timer, #);
+}
+
+proc tst_OutTimer(int tt, list #)
+"USAGE: tst_OutTimer(ticks [, prefix])
+RETURN: none
+PURPOSE: reports value of tt to tst-output;
+         if prefix is given, timer output is prefixed by it.
+SEE ALSO: tst_InitTimer, tst_GetTimer, tst_StopTimer, tst_ReportTimer, tst_init
+"
+{
+  string prefix = "OutTimer";
+  
+  if (size(#) > 0)
+  {
+    prefix = string(#[1]);
+  }
+  tst_status_out(prefix, "tst-Timer", tt);
 }
 

Singular/Makefile.in

@@ -105 +105 @@
     GMPrat.cc multicnt.cc npolygon.cc semic.cc spectrum.cc splist.cc \
     libparse.cc mod_raw.cc \
-    pcv.cc kbuckets.cc\
+    pcv.cc kbuckets.cc sbuckets.cc\
     mpr_inout.cc mpr_base.cc mpr_numeric.cc \
     prCopy.cc p_Mult_q.cc \
@@ -114 +114 @@
 MPSR_SOURCES = mpsr_Put.cc mpsr_PutPoly.cc mpsr_GetPoly.cc mpsr_sl.cc\
         mpsr_Get.cc mpsr_GetMisc.cc mpsr_Error.cc \
+
 
 # stuff for dbm
@@ -146 +147 @@
         p_Minus_mm_Mult_qq__Template.cc p_Add_q__Template.cc \
         p_Neg__Template.cc pp_Mult_Coeff_mm_DivSelect__Template.cc \
+        pp_Mult_Coeff_mm_DivSelectMult__Template.cc \
         p_Merge_q__Template.cc pp_Mult_mm_Noether__Template.cc\
         p_kBucketSetLm__Template.cc \
@@ -165 +167 @@
         ndbm.h dbm_sl.h polys-impl.h libparse.h \
         GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h multicnt.h \
-        pcv.h mod_raw.h kbuckets.h \
+        pcv.h mod_raw.h kbuckets.h sbuckets.h\
         mpr_global.h mpr_inout.h mpr_base.h mpr_numeric.h \
         feOpt.h fegetopt.h distrib.h walk.h \
@@ -173 +175 @@
         omSingularConfig.h pShallowCopyDelete.h \
         p_Procs_Dynamic.h p_Procs_Impl.h p_Procs_Set.h \
-        p_Procs.h p_Procs_Static.h 
-
-DISTFILES=${SOURCES} ${HEADERS} Makefile.in configure.in configure \
+        p_Procs.h p_Procs_Static.h p_Mult_q.h
+
+DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} \
+        Makefile.in configure.in configure \
         mod2.h.in grammar.h testgh install-sh mkinstalldirs \
         check_aso.pl prCopy.pl
@@ -495 +498 @@
         mcopy -o Singular-${SINGULAR_VERSION}-src.tar.gz a:
 
-TAGS:   ${SOURCES} ${HEADERS} 
-        etags ${SOURCES} ${HEADERS}
+TAGS:   ${SOURCES} ${ESOURCES} ${HEADERS} 
+        etags ${SOURCES} ${ESOURCES} ${HEADERS}
 
 tags:   
@@ -601 +604 @@
 
 p_Procs_Lib_%.dl_og : p_Procs_Lib.cc  p_Procs_Dynamic.og
-        ${CXXG} ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -Dp_Procs_$* -c $< -o $@
+        ${CXXG} ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} ${SFLAGS} -Dp_Procs_$* -c $< -o $@
 
 %.dl_og: %.cc
@@ -843 +846 @@
 
 %_d.c : %.c
-        $(CCG) $(CFLAGSG) ${CPPFLAGS} -E -P $< | $(PERL) -p -e 's/;/;\n/g' | $(PERL) -p -e 's/\{/\n\{/g' | $(PERL) -p -e 's/\}/\n\}/g' > $@
+        $(CCG) $(CFLAGSG) ${CPPFLAGS} ${DEFS}-E -P $< | $(PERL) -p -e 's/;/;\n/g' | $(PERL) -p -e 's/\{/\n\{/g' | $(PERL) -p -e 's/\}/\n\}/g' > $@
 
 %_d.cc : %.cc
-        $(CCG) $(CXXFLAGS) ${CPPFLAGS} -E -P $< | $(PERL) -p -e 's/;/;\n/g' | $(PERL) -p -e 's/\{/\n\{/g' | $(PERL) -p -e 's/\}/\n\}/g' > $@
+        $(CCG) $(CXXFLAGS) ${CPPFLAGS} ${DEFS} -E -P $< | $(PERL) -p -e 's/;/;\n/g' | $(PERL) -p -e 's/\{/\n\{/g' | $(PERL) -p -e 's/\}/\n\}/g' > $@
 
 .PRECIOUS: %_d.cc %_d.c

Singular/configure

@@ -600 +600 @@
 SINGULAR_MAJOR_VERSION=${SINGULAR_MAJOR_VERSION:-1}
 SINGULAR_MINOR_VERSION=${SINGULAR_MINOR_VERSION:-3}
-SINGULAR_SUB_VERSION=${SINGULAR_SUB_VERSION:-12}
+SINGULAR_SUB_VERSION=${SINGULAR_SUB_VERSION:-13}
 SINGULAR_VERSION="${SINGULAR_VERSION:-$SINGULAR_MAJOR_VERSION${VERSION_SEP}$SINGULAR_MINOR_VERSION${VERSION_SEP}$SINGULAR_SUB_VERSION}"
-VERSION_DATE=${VERSION_DATE:-"December 2000"}
+VERSION_DATE=${VERSION_DATE:-"January 2001"}
 
 
@@ -1796 +1796 @@
           fi
         ;;
+        IRIX-6)
+          LD_DYN_FLAGS="-lc"
+          ac_lib_dl=yes
+        ;;
 esac
 
@@ -1805 +1809 @@
 # heder file checks
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1808: checking for ANSI C header files" >&5
+echo "configure:1812: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1813 "configure"
+#line 1817 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1818 +1822 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1835 +1839 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1838 "configure"
+#line 1842 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -1853 +1857 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1856 "configure"
+#line 1860 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1874 +1878 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1877 "configure"
+#line 1881 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -1885 +1889 @@
 
 EOF
-if { (eval echo configure:1888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
@@ -1912 +1916 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1915: checking for $ac_hdr" >&5
+echo "configure:1919: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1920 "configure"
+#line 1924 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1954 +1958 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1957: checking for $ac_hdr" >&5
+echo "configure:1961: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1962 "configure"
+#line 1966 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1993 +1997 @@
 # typedefs, structures
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1996: checking for working const" >&5
+echo "configure:2000: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2001 "configure"
+#line 2005 "configure"
 #include "confdefs.h"
 
@@ -2047 +2051 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -2068 +2072 @@
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2071: checking for inline" >&5
+echo "configure:2075: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2075 +2079 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2078 "configure"
+#line 2082 "configure"
 #include "confdefs.h"
 
@@ -2082 +2086 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -2108 +2112 @@
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2111: checking for size_t" >&5
+echo "configure:2115: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2116 "configure"
+#line 2120 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2141 +2145 @@
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2144: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2148: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2149 "configure"
+#line 2153 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2155 +2159 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
@@ -2176 +2180 @@
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2179: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2183: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2184 "configure"
+#line 2188 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2189 +2193 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
@@ -2214 +2218 @@
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2217: checking for working alloca.h" >&5
+echo "configure:2221: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2222 "configure"
+#line 2226 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -2226 +2230 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
@@ -2247 +2251 @@
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2250: checking for alloca" >&5
+echo "configure:2254: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2255 "configure"
+#line 2259 "configure"
 #include "confdefs.h"
 
@@ -2280 +2284 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
@@ -2312 +2316 @@
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2315: checking whether alloca needs Cray hooks" >&5
+echo "configure:2319: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2320 "configure"
+#line 2324 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -2342 +2346 @@
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2345: checking for $ac_func" >&5
+echo "configure:2349: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2350 "configure"
+#line 2354 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2370 +2374 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2397 +2401 @@
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2400: checking stack direction for C alloca" >&5
+echo "configure:2404: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2405 +2409 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2408 "configure"
+#line 2412 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -2424 +2428 @@
 }
 EOF
-if { (eval echo configure:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
@@ -2447 +2451 @@
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:2450: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:2454: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2453 +2457 @@
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 2456 "configure"
+#line 2460 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
@@ -2471 +2475 @@
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 2474 "configure"
+#line 2478 "configure"
 #include "confdefs.h"
 #include <termio.h>
@@ -2496 +2500 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2499: checking for $ac_hdr" >&5
+echo "configure:2503: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2504 "configure"
+#line 2508 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -2535 +2539 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2538: checking for $ac_func" >&5
+echo "configure:2542: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2543 "configure"
+#line 2547 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2563 +2567 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2588 +2592 @@
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2591: checking for working mmap" >&5
+echo "configure:2595: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2596 +2600 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2603 "configure"
 #include "confdefs.h"
 
@@ -2736 +2740 @@
 
 EOF
-if { (eval echo configure:2739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
@@ -2759 +2763 @@
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2762: checking return type of signal handlers" >&5
+echo "configure:2766: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2767 "configure"
+#line 2771 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2781 +2785 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
@@ -2800 +2804 @@
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2803: checking for vprintf" >&5
+echo "configure:2807: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2808 "configure"
+#line 2812 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2828 +2832 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
@@ -2852 +2856 @@
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2855: checking for _doprnt" >&5
+echo "configure:2859: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2860 "configure"
+#line 2864 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2880 +2884 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
@@ -2906 +2910 @@
 
 echo $ac_n "checking for library containing setenv""... $ac_c" 1>&6
-echo "configure:2909: checking for library containing setenv" >&5
+echo "configure:2913: checking for library containing setenv" >&5
 if eval "test \"`echo '$''{'ac_cv_search_setenv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2913 +2917 @@
 ac_cv_search_setenv="no"
 cat > conftest.$ac_ext <<EOF
-#line 2916 "configure"
+#line 2920 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2924 +2928 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_setenv="none required"
@@ -2935 +2939 @@
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2938 "configure"
+#line 2942 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2946 +2950 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_setenv="-l$i"
@@ -2969 +2973 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2972: checking for $ac_func" >&5
+echo "configure:2976: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2977 "configure"
+#line 2981 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2997 +3001 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -3026 +3030 @@
 # arithmetic shifts
 echo $ac_n "checking whether your machine has correct arithmetic shifts""... $ac_c" 1>&6
-echo "configure:3029: checking whether your machine has correct arithmetic shifts" >&5
+echo "configure:3033: checking whether your machine has correct arithmetic shifts" >&5
 if eval "test \"`echo '$''{'ac_cv_shift'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3039 +3043 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3042 "configure"
+#line 3046 "configure"
 #include "confdefs.h"
  int main() { if (-2 >> 1 == -1) exit(0); else exit(1); } 
 EOF
-if { (eval echo configure:3046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_shift=yes
@@ -3068 +3072 @@
 # check for a peculiar constructor initialization
 echo $ac_n "checking whether explicit C++ constructor calls are allowed""... $ac_c" 1>&6
-echo "configure:3071: checking whether explicit C++ constructor calls are allowed" >&5
+echo "configure:3075: checking whether explicit C++ constructor calls are allowed" >&5
 
 ac_ext=C
@@ -3081 +3085 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3084 "configure"
+#line 3088 "configure"
 #include "confdefs.h"
 
@@ -3099 +3103 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_explicit_const=yes
@@ -3128 +3132 @@
 # sprintf returns number of printed chars
 echo $ac_n "checking whether vsprintf returns number of printed chars""... $ac_c" 1>&6
-echo "configure:3131: checking whether vsprintf returns number of printed chars" >&5
+echo "configure:3135: checking whether vsprintf returns number of printed chars" >&5
 if eval "test \"`echo '$''{'ac_cv_returns_n_of_chars'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3136 +3140 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3139 "configure"
+#line 3143 "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
-if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_returns_n_of_chars=yes
@@ -3167 +3171 @@
 # determine ALIGN_8
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:3170: checking size of char" >&5
+echo "configure:3174: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3175 +3179 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3178 "configure"
+#line 3182 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3186 +3190 @@
 }
 EOF
-if { (eval echo configure:3189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
@@ -3206 +3210 @@
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3209: checking size of short" >&5
+echo "configure:3213: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3214 +3218 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3217 "configure"
+#line 3221 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3225 +3229 @@
 }
 EOF
-if { (eval echo configure:3228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
@@ -3245 +3249 @@
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3248: checking size of int" >&5
+echo "configure:3252: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3253 +3257 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3256 "configure"
+#line 3260 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3264 +3268 @@
 }
 EOF
-if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
@@ -3284 +3288 @@
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3287: checking size of long" >&5
+echo "configure:3291: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3292 +3296 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3295 "configure"
+#line 3299 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3303 +3307 @@
 }
 EOF
-if { (eval echo configure:3306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
@@ -3323 +3327 @@
 
 echo $ac_n "checking size of void*""... $ac_c" 1>&6
-echo "configure:3326: checking size of void*" >&5
+echo "configure:3330: checking size of void*" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3331 +3335 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3334 "configure"
+#line 3338 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3342 +3346 @@
 }
 EOF
-if { (eval echo configure:3345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_voidp=`cat conftestval`
@@ -3362 +3366 @@
 
 echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:3365: checking size of double" >&5
+echo "configure:3369: checking size of double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3370 +3374 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3373 "configure"
+#line 3377 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3381 +3385 @@
 }
 EOF
-if { (eval echo configure:3384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_double=`cat conftestval`
@@ -3401 +3405 @@
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3404: checking whether byte ordering is bigendian" >&5
+echo "configure:3408: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3408 +3412 @@
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3411 "configure"
+#line 3415 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3419 +3423 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3426 "configure"
+#line 3430 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3434 +3438 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
@@ -3454 +3458 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3457 "configure"
+#line 3461 "configure"
 #include "confdefs.h"
 main () {
@@ -3467 +3471 @@
 }
 EOF
-if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
@@ -3585 +3589 @@
 
 echo $ac_n "checking whether to use dynamic linking""... $ac_c" 1>&6
-echo "configure:3588: checking whether to use dynamic linking" >&5
+echo "configure:3592: checking whether to use dynamic linking" >&5
 if test "$with_dl" != no && test "$ac_lib_dl" = yes; then
   cat >> confdefs.h <<\EOF
@@ -3598 +3602 @@
 
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:3601: checking for tgetent in -lncurses" >&5
+echo "configure:3605: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3606 +3610 @@
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3609 "configure"
+#line 3613 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3617 +3621 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3644 +3648 @@
 \
  echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:3647: checking for tgetent in -lcurses" >&5
+echo "configure:3651: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3652 +3656 @@
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3655 "configure"
+#line 3659 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3663 +3667 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3690 +3694 @@
 \
   echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:3693: checking for tgetent in -ltermcap" >&5
+echo "configure:3697: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3698 +3702 @@
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3701 "configure"
+#line 3705 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3709 +3713 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3758 +3762 @@
 
    echo $ac_n "checking for rl_abort in -lreadline""... $ac_c" 1>&6
-echo "configure:3761: checking for rl_abort in -lreadline" >&5
+echo "configure:3765: checking for rl_abort in -lreadline" >&5
 ac_lib_var=`echo readline'_'rl_abort | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3766 +3770 @@
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3769 "configure"
+#line 3773 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3780 +3784 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3808 +3812 @@
 
    echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:3811: checking how to run the C++ preprocessor" >&5
+echo "configure:3815: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
@@ -3821 +3825 @@
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 3824 "configure"
+#line 3828 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -3854 +3858 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3857: checking for $ac_hdr" >&5
+echo "configure:3861: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3862 "configure"
+#line 3866 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -3893 +3897 @@
       test "$ac_cv_header_readline_readline_h" = yes; then
      echo $ac_n "checking whether readline.h is ok""... $ac_c" 1>&6
-echo "configure:3896: checking whether readline.h is ok" >&5
+echo "configure:3900: checking whether readline.h is ok" >&5
      if eval "test \"`echo '$''{'ac_cv_header_readline_readline_h_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3901 "configure"
+#line 3905 "configure"
 #include "confdefs.h"
 #include<unistd.h>
@@ -3923 +3927 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_readline_readline_h_ok="yes"
@@ -3939 +3943 @@
 #not ok -- try once more with explicitly declaring everything
       echo $ac_n "checking whether or not we nevertheless can use readline""... $ac_c" 1>&6
-echo "configure:3942: checking whether or not we nevertheless can use readline" >&5
+echo "configure:3946: checking whether or not we nevertheless can use readline" >&5
       if eval "test \"`echo '$''{'ac_cv_have_readline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3947 "configure"
+#line 3951 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3978 +3982 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_readline="yes"
@@ -4017 +4021 @@
 
 echo $ac_n "checking which readline to use""... $ac_c" 1>&6
-echo "configure:4020: checking which readline to use" >&5
+echo "configure:4024: checking which readline to use" >&5
 if test "$ac_cv_with_readline" = dynamic; then
   echo "$ac_t""dynamic" 1>&6
@@ -4035 +4039 @@
 # gmp, smallgmp, MP, MPT, factory, libfac
 echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
-echo "configure:4038: checking for main in -lgmp" >&5
+echo "configure:4042: checking for main in -lgmp" >&5
 ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4043 +4047 @@
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4046 "configure"
+#line 4050 "configure"
 #include "confdefs.h"
 
@@ -4050 +4054 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4081 +4085 @@
 fi
 echo $ac_n "checking for main in -lsmallgmp""... $ac_c" 1>&6
-echo "configure:4084: checking for main in -lsmallgmp" >&5
+echo "configure:4088: checking for main in -lsmallgmp" >&5
 ac_lib_var=`echo smallgmp'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4089 +4093 @@
 LIBS="-lsmallgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4092 "configure"
+#line 4096 "configure"
 #include "confdefs.h"
 
@@ -4096 +4100 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4125 +4129 @@
 SAVE_LIBS=$LIBS
 echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
-echo "configure:4128: checking for IMP_PutGmpInt in -lMP" >&5
+echo "configure:4132: checking for IMP_PutGmpInt in -lMP" >&5
 ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4133 +4137 @@
 LIBS="-lMP $MP_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4136 "configure"
+#line 4140 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4144 +4148 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4172 +4176 @@
 
 echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
-echo "configure:4175: checking for MPT_GetTree in -lMPT" >&5
+echo "configure:4179: checking for MPT_GetTree in -lMPT" >&5
 ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4180 +4184 @@
 LIBS="-lMPT $MP_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4183 "configure"
+#line 4187 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4191 +4195 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4220 +4224 @@
 LIBS=$SAVE_LIBS
 echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
-echo "configure:4223: checking for atof in -lsingcf" >&5
+echo "configure:4227: checking for atof in -lsingcf" >&5
 ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4228 +4232 @@
 LIBS="-lsingcf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4231 "configure"
+#line 4235 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4239 +4243 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4267 +4271 @@
 
 echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
-echo "configure:4270: checking for atof in -lsingfac" >&5
+echo "configure:4274: checking for atof in -lsingfac" >&5
 ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4275 +4279 @@
 LIBS="-lsingfac  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4278 "configure"
+#line 4282 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4286 +4290 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4314 +4318 @@
 
 echo $ac_n "checking for omTestAddr in -lomalloc""... $ac_c" 1>&6
-echo "configure:4317: checking for omTestAddr in -lomalloc" >&5
+echo "configure:4321: checking for omTestAddr in -lomalloc" >&5
 ac_lib_var=`echo omalloc'_'omTestAddr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4322 +4326 @@
 LIBS="-lomalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4325 "configure"
+#line 4329 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4333 +4337 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4361 +4365 @@
 
 echo $ac_n "checking for main in -lomalloc_ndebug""... $ac_c" 1>&6
-echo "configure:4364: checking for main in -lomalloc_ndebug" >&5
+echo "configure:4368: checking for main in -lomalloc_ndebug" >&5
 ac_lib_var=`echo omalloc_ndebug'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4369 +4373 @@
 LIBS="-lomalloc_ndebug  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4372 "configure"
+#line 4376 "configure"
 #include "confdefs.h"
 
@@ -4376 +4380 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4408 +4412 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4411: checking for $ac_hdr" >&5
+echo "configure:4415: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4416 "configure"
+#line 4420 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -4487 +4491 @@
 
 echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
-echo "configure:4490: checking which apint package to use" >&5
+echo "configure:4494: checking which apint package to use" >&5
 if test "${with_apint}" != gmp && test "${with_apint}" != smallgmp; then
   if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
@@ -4529 +4533 @@
 #
 echo $ac_n "checking whether to have MP""... $ac_c" 1>&6
-echo "configure:4532: checking whether to have MP" >&5
+echo "configure:4536: checking whether to have MP" >&5
 if test "${with_MP}" != yes && test "${with_MP}" != no; then
   if (test "${will_have_gmp}" = yes) && \
@@ -4564 +4568 @@
 
 echo $ac_n "checking whether to have factory""... $ac_c" 1>&6
-echo "configure:4567: checking whether to have factory" >&5
+echo "configure:4571: checking whether to have factory" >&5
 if test "${with_factory}" != yes && test "${with_factory}" != no; then
   if test "$ac_factory_ok" =  yes || test "$enable_factory" = yes; then
@@ -4595 +4599 @@
 
 echo $ac_n "checking whether to have libfac""... $ac_c" 1>&6
-echo "configure:4598: checking whether to have libfac" >&5
+echo "configure:4602: checking whether to have libfac" >&5
 if test "${with_libfac}" != yes && test "${with_libfac}" != no; then
   if (test "${will_have_factory}" = yes) && \
@@ -4629 +4633 @@
 
 echo $ac_n "checking whether to have dbm links""... $ac_c" 1>&6
-echo "configure:4632: checking whether to have dbm links" >&5
+echo "configure:4636: checking whether to have dbm links" >&5
 if test "$with_dbm" != no; then
   cat >> confdefs.h <<\EOF
@@ -4641 +4645 @@
 
 echo $ac_n "checking whether to have namespaces""... $ac_c" 1>&6
-echo "configure:4644: checking whether to have namespaces" >&5
+echo "configure:4648: checking whether to have namespaces" >&5
 if test "$with_namespaces" != yes; then
   echo "$ac_t""no" 1>&6
@@ -4653 +4657 @@
 
 echo $ac_n "checking whether to have dynamic modules""... $ac_c" 1>&6
-echo "configure:4656: checking whether to have dynamic modules" >&5
+echo "configure:4660: checking whether to have dynamic modules" >&5
 if test "$with_dynamic_modules" != yes || test "$ac_have_dl" != yes; then
   echo "$ac_t""no" 1>&6
@@ -4665 +4669 @@
 
 echo $ac_n "checking whether to have dynamic kernel""... $ac_c" 1>&6
-echo "configure:4668: checking whether to have dynamic kernel" >&5
+echo "configure:4672: checking whether to have dynamic kernel" >&5
 if test "$with_dynamic_kernel" != no && test "$ac_lib_dl" = yes; then
   DL_KERNEL=1
@@ -4673 +4677 @@
 
 echo $ac_n "checking whether to have Plural""... $ac_c" 1>&6
-echo "configure:4676: checking whether to have Plural" >&5
+echo "configure:4680: checking whether to have Plural" >&5
 if test "$with_plural" != yes; then
   echo "$ac_t""no" 1>&6

Singular/configure.in

@@ -48 +48 @@
 SINGULAR_MAJOR_VERSION=${SINGULAR_MAJOR_VERSION:-1}
 SINGULAR_MINOR_VERSION=${SINGULAR_MINOR_VERSION:-3}
-SINGULAR_SUB_VERSION=${SINGULAR_SUB_VERSION:-12}
+SINGULAR_SUB_VERSION=${SINGULAR_SUB_VERSION:-13}
 SINGULAR_VERSION="${SINGULAR_VERSION:-$SINGULAR_MAJOR_VERSION${VERSION_SEP}$SINGULAR_MINOR_VERSION${VERSION_SEP}$SINGULAR_SUB_VERSION}"
-VERSION_DATE=${VERSION_DATE:-"December 2000"}
+VERSION_DATE=${VERSION_DATE:-"January 2001"}
 
 dnl pass them on into the Makefiles

Singular/dError.c

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 9/00
- *  Version: $Id: dError.c,v 1.5 2000-11-06 15:20:37 obachman Exp $
+ *  Version: $Id: dError.c,v 1.6 2000-12-31 15:14:29 obachman Exp $
  *******************************************************************/
 #ifndef DERROR_C
@@ -33 +33 @@
   fprintf(stderr, "\n// ***dErrror: ");
   vfprintf(stderr, fmt, ap);
+#if !defined(OM_NDEBUG) && defined(HAVE_CONFIG_H)
   fprintf(stderr, " occured at: \n");
-#ifdef HAVE_CONFIG_H
   omPrintCurrentBackTraceMax(stderr, 8);
 #endif

Singular/dError.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 9/00
- *  Version: $Id: dError.h,v 1.4 2000-12-07 15:03:55 obachman Exp $
+ *  Version: $Id: dError.h,v 1.5 2000-12-31 15:14:29 obachman Exp $
  *******************************************************************/
 #ifndef DERROR_H
@@ -18 +18 @@
 extern int dReportError(const char* fmt, ...);
 #define dReportBug(s) \
-  dReportError("Bug reported %s\n occured at %s,%l\n", s, __FILE__, __LINE__)
+  dReportError("Bug reported: %s\n occured at %s,%d\n", s, __FILE__, __LINE__)
 #endif
 

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.118 2000-12-14 16:38:48 obachman Exp $ */
+/* $Id: ideals.cc,v 1.119 2000-12-31 15:14:30 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2592 +2592 @@
 }
 
+// #define NEW_STUFF
+#ifndef NEW_STUFF
 // converts mat to module, destroys mat
 ideal idMatrix2Module(matrix mat)
@@ -2622 +2624 @@
   return result;
 }
+#else
+
+#include "sbuckets.h"
+
+// converts mat to module, destroys mat
+ideal idMatrix2Module(matrix mat)
+{
+  ideal result = idInit(MATCOLS(mat),MATROWS(mat));
+  int i,j, l;
+  poly h;
+  poly p;
+  sBucket_pt bucket = sBucketInit(currRing);
+
+  for(j=0;j<MATCOLS(mat);j++) /* j is also index in result->m */
+  {
+    for (i=1;i<=MATROWS(mat);i++)
+    {
+      h = MATELEM(mat,i,j+1);
+      if (h!=NULL)
+      {
+        MATELEM(mat,i,j+1)=NULL;
+        p_SetCompP(h,i, currRing, &l);
+        sBucket_Merge_p(bucket, h, l);
+      }
+    }
+    sBucketClearMerge(bucket, &(result->m[j]), &l);
+  }
+  
+  // obachman: need to clean this up
+  idDelete((ideal*) &mat);
+  return result;
+}
+#endif
 
 /*2
@@ -2667 +2702 @@
     }
   }
-// obachman 10/99: added the following line, otherwise memory lack!
+  // obachman 10/99: added the following line, otherwise memory leack!
   idDelete(&mod);
   return result;

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.244 2000-12-19 18:31:39 obachman Exp $ */
+/* $Id: iparith.cc,v 1.245 2000-12-31 15:14:30 obachman Exp $ */
 
 /*
@@ -1744 +1744 @@
   return FALSE;
 }
+static BOOLEAN jjGCD_N(leftv res, leftv u, leftv v)
+{
+  res->rtyp=NUMBER_CMD;
+  res->data=(char *)nGcd((number) u->Data(), (number) v->Data());
+  return FALSE;
+}
 static BOOLEAN jjHILBERT2(leftv res, leftv u, leftv v)
 {
@@ -2353 +2359 @@
 ,{jjWRONG2,    GCD_CMD,        POLY_CMD,       POLY_CMD,   POLY_CMD PROFILER}
 #endif
+,{jjGCD_N,     GCD_CMD,        NUMBER_CMD,     NUMBER_CMD, NUMBER_CMD PROFILER}
 ,{jjHILBERT2,  HILBERT_CMD,    INTVEC_CMD,     IDEAL_CMD,  INT_CMD PROFILER}
 ,{jjHILBERT2,  HILBERT_CMD,    INTVEC_CMD,     MODUL_CMD,  INT_CMD PROFILER}

Singular/kInline.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: kInline.cc,v 1.22 2000-12-21 16:37:49 obachman Exp $
+ *  Version: $Id: kInline.cc,v 1.23 2000-12-31 15:14:32 obachman Exp $
  *******************************************************************/
 #ifndef KINLINE_CC
@@ -269 +269 @@
 }
 
+KINLINE poly sTObject::Next()
+{
+  assume(p != NULL || t_p != NULL);
+  if (t_p != NULL) return pNext(t_p);
+  return pNext(p);
+}
     
 // Iterations
@@ -620 +626 @@
                               new_tailRing->PolyBin,p_shallow_copy_delete, 
                               FALSE);
+  last = NULL;
 }
 
@@ -691 +698 @@
   
   if (last == NULL || pLength == 0) 
-    last = pLast((t_p != NULL ? t_p : p), pLength);
+    last = pLast(GetLmTailRing(), pLength);
 #ifdef HAVE_ASSUME
   long fdeg;

Singular/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.22 2000-11-28 11:50:51 obachman Exp $ */
+/* $Id: kbuckets.cc,v 1.23 2000-12-31 15:14:32 obachman Exp $ */
 
 #include "mod2.h"
@@ -137 +137 @@
 }
 
-
 /////////////////////////////////////////////////////////////////////////////
 // Convertion from/to Bpolys
@@ -270 +269 @@
     *length = 0;
   }
+}
+
+void kBucketSetLm(kBucket_pt bucket, poly lm)
+{
+  kBucketMergeLm(bucket);
+  pNext(lm) = NULL;
+  bucket->buckets[0] = lm;
+  bucket->buckets_length[0] = 1;
 }
 
@@ -358 +365 @@
 }
 
+
+//////////////////////////////////////////////////////////////////////////
+///
+/// Add to Bucket a poly ,i.e. Bpoly == n*Bpoly
+///
+void kBucket_Add_q(kBucket_pt bucket, poly q, int *l)
+{
+  if (q == NULL) return;
+  assume(*l <= 0 || pLength(q) == *l);
+
+  int i, l1;
+  ring r = bucket->bucket_ring;
+
+  if (*l <= 0)
+  {
+    l1 = pLength(q);
+    *l = l1;
+  }
+  else
+    l1 = *l;
+  
+  kBucketMergeLm(bucket);
+  kbTest(bucket);
+  i = pLogLength(l1);
+
+  while (bucket->buckets[i] != NULL)
+  {
+    q = p_Add_q(q, bucket->buckets[i],
+                 l1, bucket->buckets_length[i], r);
+    bucket->buckets[i] = NULL;
+    bucket->buckets_length[i] = 0;
+    i = pLogLength(l1);
+  }
+
+  bucket->buckets[i] = q;
+  bucket->buckets_length[i]=l1;
+  if (i >= bucket->buckets_used)
+    bucket->buckets_used = i;
+  else
+    kBucketAdjustBucketsUsed(bucket);
+  kbTest(bucket);
+}
+
+
+
 //////////////////////////////////////////////////////////////////////////
 ///
@@ -432 +484 @@
 #endif
   kbTest(bucket);
+}
+
+//////////////////////////////////////////////////////////////////////////
+///
+/// Bpoly == Bpoly - m*p; where m is a monom
+/// Does not destroy p and m
+/// assume (l <= 0 || pLength(p) == l)
+void kBucket_Plus_mm_Mult_pp(kBucket_pt bucket, poly m, poly p, int l)
+{
+  assume(l <= 0 || pLength(p) == l);
+  int i, l1;
+  poly p1 = p;
+  poly last;
+  ring r = bucket->bucket_ring;
+
+  if (l <= 0)
+  {
+    l1 = pLength(p1);
+    l = l1;
+  }
+  else
+    l1 = l;
+
+  if (m == NULL || p == NULL) return;
+
+  kBucketMergeLm(bucket);
+  kbTest(bucket);
+  i = pLogLength(l1);
+
+  if (i <= bucket->buckets_used && bucket->buckets[i] != NULL)
+  {
+    p1 = p_Plus_mm_Mult_qq(bucket->buckets[i], m, p1,
+                           bucket->buckets_length[i], l1, r);
+    l1 = bucket->buckets_length[i];
+    bucket->buckets[i] = NULL;
+    bucket->buckets_length[i] = 0;
+    i = pLogLength(l1);
+  }
+  else
+  {
+    p1 = r->p_Procs->pp_Mult_mm(p1, m, r, last);
+  }
+    
+  while (bucket->buckets[i] != NULL)
+  {
+    p1 = p_Add_q(p1, bucket->buckets[i],
+                 l1, bucket->buckets_length[i], r);
+    bucket->buckets[i] = NULL;
+    bucket->buckets_length[i] = 0;
+    i = pLogLength(l1);
+  }
+
+  bucket->buckets[i] = p1;
+  bucket->buckets_length[i]=l1;
+  if (i >= bucket->buckets_used)
+    bucket->buckets_used = i;
+  else
+    kBucketAdjustBucketsUsed(bucket);
+
+  kbTest(bucket);
+}
+
+poly kBucket_ExtractLarger(kBucket_pt bucket, poly q, poly append)
+{
+  if (q == NULL) return append;
+  poly lm;
+  do
+  {
+    lm = kBucketGetLm(bucket);
+    if (lm == NULL) return append;
+    if (p_LmCmp(lm, q, bucket->bucket_ring) == 1)
+    {
+      lm = kBucketExtractLm(bucket);
+      pNext(append) = lm;
+      pIter(append);
+    }
+    else
+    {
+      return append;
+    }
+  }
+  while (1);
 }
 

Singular/kbuckets.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.h,v 1.13 2000-11-28 11:50:52 obachman Exp $ */
+/* $Id: kbuckets.h,v 1.14 2000-12-31 15:14:32 obachman Exp $ */
 #include "structs.h"
 #include "p_Procs.h"
@@ -37 +37 @@
 // i.e., afterwards Bpoly == 0
 void kBucketClear(kBucket_pt bucket, poly *p, int *length);
+inline poly kBucketClear(kBucket_pt bucket)
+{
+  int dummy;
+  poly p;
+  kBucketClear(bucket, &p, &dummy);
+  return p;
+}
 
 // Canonicalizes Bpoly, i.e. converts polys of buckets into one poly in
@@ -53 +60 @@
 //
 inline poly kBucketExtractLm(kBucket_pt bucket);
+
+/////////////////////////////////////////////////////////////////////////////
+// Sets Lm of Bpoly, i.e. Bpoly is changed s.t.
+// Bpoly = Bpoly + m
+// assumes that m is larger than all monomials of Bpoly
+void kBucketSetLm(kBucket_pt bucket, poly lm);
+
 
 /////////////////////////////////////////////////////////////////////////////
@@ -92 +106 @@
 void kBucket_Mult_n(kBucket_pt bucket, number n);
 
+//////////////////////////////////////////////////////////////////////////
+///
+/// Extract all monomials of bucket which are larger than q
+/// Append those to append, and return last monomial of append
+poly kBucket_ExtractLarger(kBucket_pt bucket, poly q, poly append);
+
+
+//////////////////////////////////////////////////////////////////////////
+///
+/// Add to Bucket a poly ,i.e. Bpoly == Bpoly + q
+///
+void kBucket_Add_q(kBucket_pt bucket, poly q, int* lq);
+
+// first, do ExtractLarger
+// then add q
+inline poly 
+kBucket_ExtractLarger_Add_q(kBucket_pt bucket, poly append, poly q, int *lq)
+{
+  append = kBucket_ExtractLarger(bucket, q, append);
+  kBucket_Add_q(bucket, q, lq);
+  return append;
+}
 
 //////////////////////////////////////////////////////////////////////////
@@ -101 +137 @@
                             poly spNother = NULL);
 
+//////////////////////////////////////////////////////////////////////////
+///
+/// Bpoly == Bpoly + m*p; where m is a monom
+/// Does not destroy p and m
+/// assume (l <= 0 || pLength(p) == l)
+void kBucket_Plus_mm_Mult_pp(kBucket_pt bucket, poly m, poly p, int l);
 
 //////////////////////////////////////////////////////////////////////////

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.76 2000-12-21 16:37:49 obachman Exp $ */
+/* $Id: kstd1.cc,v 1.77 2000-12-31 15:14:33 obachman Exp $ */
 /*
 * ABSTRACT:
@@ -11 +11 @@
 
 // define if tailrings should be used
-// #define HAVE_TAIL_RING
+#define HAVE_TAIL_RING
 
 #include "mod2.h"
@@ -738 +738 @@
       {
         pLmFree(strat->L[j].p);    /*deletes the short spoly and computes*/
+        strat->L[j].p = NULL;
         poly m1 = NULL, m2 = NULL;
         // check that spoly creation is ok 
@@ -752 +753 @@
                       strat->tailRing, m1, m2, strat->R);
 
+        strat->L[j].SetLmCurrRing();
         if (!strat->honey)
           strat->initEcart(&strat->L[j]);
@@ -795 +797 @@
       {
         pLmFree(strat->L[i].p);
+        strat->L[i].p = NULL;
         poly m1 = NULL, m2 = NULL;
         // check that spoly creation is ok 
@@ -810 +813 @@
         if (! strat->L[i].IsNull())
         {
+          strat->L[i].SetLmCurrRing();
           strat->L[i].SetpFDeg();
           strat->L[i].ecart 

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.91 2000-12-21 16:37:50 obachman Exp $ */
+/* $Id: kutil.cc,v 1.92 2000-12-31 15:14:33 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -696 +696 @@
     {
       kFalseReturn(kTest_L(&(strat->L[i]), strat->tailRing,
-                           (pNext(strat->L[i].p) != strat->tail), i,
+                           strat->L[i].Next() != strat->tail, i,
                            strat->T, strat->tl));
-      if (strat->use_buckets && pNext(strat->L[i].p) != strat->tail && 
-          strat->L[i].p1 != NULL)
+      if (strat->use_buckets && strat->L[i].Next() != strat->tail && 
+          strat->L[i].Next() != NULL && strat->L[i].p1 != NULL)
       {
         assume(strat->L[i].bucket != NULL);

Singular/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.53 2000-12-21 16:37:51 obachman Exp $ */
+/* $Id: kutil.h,v 1.54 2000-12-31 15:14:34 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -96 +96 @@
 
   // Iterations
+  // simply get the next monomial
+  KINLINE poly Next();
   KINLINE void LmDeleteAndIter();
 

Singular/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.52 2000-12-15 18:49:31 Singular Exp $ */
+/* $Id: longalg.cc,v 1.53 2000-12-31 15:14:35 obachman Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -2570 +2570 @@
 BOOLEAN naDBTest(number a, char *f,int l)
 {
+#if 0
   lnumber x=(lnumber)a;
   if (x == NULL)
@@ -2612 +2613 @@
     p = p->ne;
   }
+#endif
   return TRUE;
 }

Singular/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.36 2000-12-20 17:20:01 obachman Exp $ */
+/* $Id: matpol.cc,v 1.37 2000-12-31 15:14:35 obachman Exp $ */
 
 /*
@@ -33 +33 @@
 /*0 implementation*/
 
-static void ppp(matrix);
-static void qqq() {int i=0;}
 
 typedef int perm[100];

Singular/mpr_numeric.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpr_numeric.cc,v 1.12 2000-12-18 15:44:42 obachman Exp $ */
+/* $Id: mpr_numeric.cc,v 1.13 2000-12-31 15:14:36 obachman Exp $ */
 
 /*
@@ -150 +150 @@
   omFreeSize( (ADDRESS) exp, (n+1) * sizeof(Exponent_t) );
 
-  pOrdPolyMerge(pit);
+  pSortAdd(pit);
   return pit;
 }

Singular/mpsr_Get.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_Get.cc,v 1.34 2000-12-12 11:03:00 obachman Exp $ */
+/* $Id: mpsr_Get.cc,v 1.35 2000-12-31 15:14:36 obachman Exp $ */
 /***************************************************************
  *
@@ -566 +566 @@
 
   failr(mpsr_GetPoly(link, p, node->numchild, mlv->r));
-  if (IsUnOrdered) p = pOrdPolyMerge(p);
+  if (IsUnOrdered) p = pSort(p);
   pTest(p);
   mlv->lv = mpsr_InitLeftv(POLY_CMD, (void *) p);
@@ -580 +580 @@
 
   failr(mpsr_GetPolyVector(link, p, node->numchild, mlv->r));
-  if (IsUnOrdered) p = pOrdPolyMerge(p);
+  if (IsUnOrdered) p = pSort(p);
   pTest(p);
   mlv->lv = mpsr_InitLeftv(VECTOR_CMD, (void *) p);
@@ -599 +599 @@
     mp_failr(IMP_GetUint32(link, &nmon));
     failr(mpsr_GetPoly(link, id->m[i], nmon, r));
-    if (IsUnOrdered) id->m[i] = pOrdPolyMerge(id->m[i]);
+    if (IsUnOrdered) id->m[i] = pSort(id->m[i]);
   }
   idTest(id);
@@ -626 +626 @@
     mp_failr(IMP_GetUint32(link, &nmon));
     failr(mpsr_GetPolyVector(link, id->m[i], nmon, r));
-    if (IsUnOrdered) id->m[i] = pOrdPolyMerge(id->m[i]);
+    if (IsUnOrdered) id->m[i] = pSort(id->m[i]);
   }
   if (rank == 1)
@@ -664 +664 @@
     mp_failr(IMP_GetUint32(link, &nmon));
     failr(mpsr_GetPoly(link, mp->m[i], nmon, mlv->r));
-    if (IsUnOrdered) mp->m[i] = pOrdPolyMerge(mp->m[i]);
+    if (IsUnOrdered) mp->m[i] = pSort(mp->m[i]);
   }
 

Singular/pInline0.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline0.h,v 1.5 2000-11-23 17:34:11 obachman Exp $
+ *  Version: $Id: pInline0.h,v 1.6 2000-12-31 15:14:37 obachman Exp $
  *******************************************************************/
 #ifndef PINLINE0_H
@@ -20 +20 @@
 #include "mod2.h"
 #include "p_polys.h"
+#include "ring.h"
   
-PINLINE0 void p_SetCompP(poly p, int i, ring r)
+PINLINE0 int p_SetCompP(poly p, int i, ring r)
 {
-  while (p != NULL)
+  if (p == NULL) return 0;
+  
+#ifdef PDEBUG
+  poly q = p;
+#endif
+  
+  int l = 0;
+  
+  if (rOrd_SetCompRequiresSetm(r))
   {
-    p_SetComp(p, i, r);
-    p_SetmComp(p, r);
-    pIter(p);
+    do
+    {
+      p_SetComp(p, i, r);
+      p_SetmComp(p, r);
+      l++;
+      pIter(p);
+    }
+    while (p != NULL);
   }
+  else
+  {
+    do
+    {
+      p_SetComp(p, i, r);
+      l++;
+      pIter(p);
+    }
+    while(p != NULL);
+  }
+#ifdef PDEBUG
+  p_Test(q, r);
+  assume(l == pLength(q));
+#endif
+  return l;
 }
 
-PINLINE0 void p_SetCompP(poly p, int i, ring lmRing, ring tailRing)
+PINLINE0 int p_SetCompP(poly p, int i, ring lmRing, ring tailRing)
 {
   if (p != NULL)
@@ -37 +66 @@
     p_SetComp(p, i, lmRing);
     p_SetmComp(p, lmRing);
-    p_SetCompP(pNext(p), i, tailRing);
+    return p_SetCompP(pNext(p), i, tailRing) + 1;
   }
+  else
+    return 0;
 }
 
@@ -77 +108 @@
   }
   return result;
+}
+
+BOOLEAN   p_IsConstantPoly(poly p, ring r)
+{
+  while(p!=NULL)
+  {
+    if (! p_LmIsConstantComp(p, r))
+      return FALSE;
+    pIter(p);
+  }
+  return TRUE;
 }
 

Singular/pInline1.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline1.h,v 1.14 2000-12-05 13:01:11 obachman Exp $
+ *  Version: $Id: pInline1.h,v 1.15 2000-12-31 15:14:37 obachman Exp $
  *******************************************************************/
 #ifndef PINLINE1_H
@@ -492 +492 @@
   return TRUE;
 }
+// test if monomial is a constant, i.e. if all exponents and the component 
+// is zero
+PINLINE1 BOOLEAN p_LmIsConstant(const poly p, const ring r)
+{
+  if (p_LmIsConstantComp(p, r))
+    return (p_GetComp(p, r) == 0);
+  return FALSE;
+}
+
+// like the respective p_LmIs* routines, except that p might be empty
+PINLINE1 BOOLEAN p_IsConstantComp(const poly p, const ring r)
+{
+  if (p == NULL) return TRUE;
+  return p_LmIsConstantComp(p, r);
+}
+
+PINLINE1 BOOLEAN p_IsConstant(const poly p, const ring r)
+{
+  if (p == NULL) return TRUE;
+  return p_LmIsConstant(p, r);
+}
 
 PINLINE1 BOOLEAN p_LmExpVectorAddIsOk(const poly p1, const poly p2, 

Singular/pInline2.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline2.h,v 1.22 2000-12-05 13:01:11 obachman Exp $
+ *  Version: $Id: pInline2.h,v 1.23 2000-12-31 15:14:37 obachman Exp $
  *******************************************************************/
 #ifndef PINLINE2_H
@@ -23 +23 @@
 #include "numbers.h"
 #include "p_Procs.h"
+#include "sbuckets.h"
 
 PINLINE2 number p_SetCoeff(poly p, number n, ring r)
@@ -437 +438 @@
 PINLINE2 poly p_Mult_nn(poly p, number n, const ring r)
 {
-  return r->p_Procs->p_Mult_nn(p, n, r);
+  if (n_IsOne(n, r))
+    return p;
+  else
+    return r->p_Procs->p_Mult_nn(p, n, r);
 }
 
@@ -459 +463 @@
 PINLINE2 poly pp_Mult_nn(poly p, number n, const ring r)
 {
-  return r->p_Procs->pp_Mult_nn(p, n, r);
+  if (n_IsOne(n, r))
+    return p_Copy(p, r);
+  else
+    return r->p_Procs->pp_Mult_nn(p, n, r);
 }
 
@@ -465 +472 @@
 PINLINE2 poly pp_Mult_mm(poly p, poly m, const ring r)
 {
-  poly last;
-  return r->p_Procs->pp_Mult_mm(p, m, r, last);
+  if (p_LmIsConstant(m, r))
+    return pp_Mult_nn(p, pGetCoeff(m), r);
+  else
+  {
+    poly last;
+    return r->p_Procs->pp_Mult_mm(p, m, r, last);
+  }
 }
 
@@ -472 +484 @@
 PINLINE2 poly p_Mult_mm(poly p, poly m, const ring r)
 {
-  return r->p_Procs->p_Mult_mm(p, m, r);
+  if (p_LmIsConstant(m, r))
+    return p_Mult_nn(p, pGetCoeff(m), r);
+  else
+    return r->p_Procs->p_Mult_mm(p, m, r);
 }
 
@@ -494 +509 @@
 PINLINE2 poly pp_Mult_Coeff_mm_DivSelect(poly p, const poly m, const ring r)
 {
-  return r->p_Procs->pp_Mult_Coeff_mm_DivSelect(p, m, r);
+  int shorter;
+  return r->p_Procs->pp_Mult_Coeff_mm_DivSelect(p, m, shorter, r);
+}
+
+PINLINE2 poly pp_Mult_Coeff_mm_DivSelect(poly p, int &lp, const poly m, const ring r)
+{
+  int shorter;
+  poly pp = r->p_Procs->pp_Mult_Coeff_mm_DivSelect(p, m, shorter, r);
+  lp -= shorter;
+  return pp;
 }
 
@@ -565 +589 @@
 // returns p + m*q destroys p, const: q, m
 // this should be implemented more efficiently
-PINLINE2 poly p_Plus_mm_Mult_qq(poly p, poly m, poly q, const ring r)
+PINLINE2 poly p_Plus_mm_Mult_qq(poly p, poly m, poly q, int &lp, int lq, 
+                                const ring r)
 {
   poly res, last;
@@ -575 +600 @@
 
   res = r->p_Procs->p_Minus_mm_Mult_qq(p, m, q, shorter, NULL, r, last);
+  lp = (lp + lq) - shorter;
   pSetCoeff0(m, n_old);
   n_Delete(&n_neg, r);
@@ -580 +606 @@
 }
 
+PINLINE2 poly p_Plus_mm_Mult_qq(poly p, poly m, poly q, const ring r)
+{
+  int lp = 0, lq = 0;
+  return p_Plus_mm_Mult_qq(p, m, q, lp, lq, r);
+}
+
 PINLINE2 poly p_Merge_q(poly p, poly q, const ring r)
 {
   return r->p_Procs->p_Merge_q(p, q, r);
+}
+
+PINLINE2 poly p_SortAdd(poly p, const ring r, BOOLEAN revert)
+{
+  if (revert) p = pReverse(p);
+  return sBucketSortAdd(p, r);
+}
+
+PINLINE2 poly p_SortMerge(poly p, const ring r, BOOLEAN revert)
+{
+  if (revert) p = pReverse(p);
+  return sBucketSortMerge(p, r);
 }
 

Singular/p_MemCmp.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_MemCmp.h,v 1.1 2000-09-04 14:08:17 obachman Exp $
+ *  Version: $Id: p_MemCmp.h,v 1.2 2000-12-31 15:14:37 obachman Exp $
  *******************************************************************/
 #ifndef P_MEM_CMP_H
@@ -765 +765 @@
 while (0)
 
+/***************************************************************
+ *  
+ *  Bitmask
+ *  
+ *******************************************************************/
+#define _p_MemCmp_Bitmask_Declare(s1, s2, bitmask)  \
+  const unsigned long* _s1 = ((unsigned long*) s1); \
+  const unsigned long* _s2 = ((unsigned long*) s2); \
+  register const unsigned long _bitmask = bitmask;  \
+  register unsigned long _v1;                       \
+  register unsigned long _v2;                       \
+  register unsigned long _i                         \
+
+
+#define p_MemCmp_Bitmask_LengthGeneral(s1, s2, bitmask, length, actionG, actionS)   \
+do                                                                                  \
+{                                                                                   \
+  _p_MemCmp_Bitmask_Declare(s1, s2, bitmask);                                             \
+  const unsigned long _l = (unsigned long) length;                                  \
+                                                                                    \
+  _i=0;                                                                             \
+                                                                                    \
+  while (_i < _l)                                                                   \
+  {                                                                                 \
+    _v1 = _s1[_i];                                                                  \
+    _v2 = _s2[_i];                                                                  \
+                                                                                    \
+    if ((_v1 > _v2) ||                                                              \
+        (((_v1 & _bitmask) ^ (_v2 & _bitmask)) != ((_v2 - _v1) & _bitmask)))           \
+      actionS;                                                                      \
+    _i++;                                                                           \
+  }                                                                                 \
+  actionG;                                                                          \
+}                                                                                   \
+while (0)
+
+
+#define _p_MemCmp_Bitmask(i, actionS)                                       \
+do                                                                          \
+{                                                                           \
+  _i = i;                                                                   \
+  _v1 = _s1[i];                                                             \
+  _v2 = _s2[i];                                                             \
+  if ((_v1 > _v2) ||                                                        \
+      (((_v1 & _bitmask) ^ (_v2 & _bitmask)) != ((_v2 - _v1) & _bitmask)))     \
+    actionS;                                                               \
+}                                                                           \
+while (0)
+  
+#define _p_MemCmp_Bitmask_LengthTwo(actionS)    \
+  do                                            \
+{                                               \
+  _p_MemCmp_Bitmask(0, actionS);                \
+  _p_MemCmp_Bitmask(1, actionS);                \
+}                                               \
+while (0)
+
+#define _p_MemCmp_Bitmask_LengthThree(actionS)  \
+  do                                            \
+{                                               \
+  _p_MemCmp_Bitmask_LengthTwo(actionS);         \
+  _p_MemCmp_Bitmask(2, actionS);                \
+}                                               \
+while (0)
+
+#define _p_MemCmp_Bitmask_LengthFour(actionS)   \
+  do                                            \
+{                                               \
+  _p_MemCmp_Bitmask_LengthThree(actionS);    \
+  _p_MemCmp_Bitmask(3, actionS);                \
+}                                               \
+while (0)
+
+
+#define _p_MemCmp_Bitmask_LengthFive(actionS)   \
+  do                                            \
+{                                               \
+  _p_MemCmp_Bitmask_LengthFour(actionS);     \
+  _p_MemCmp_Bitmask(4, actionS);                \
+}                                               \
+while (0)
+
+
+#define _p_MemCmp_Bitmask_LengthSix(actionS)    \
+  do                                            \
+{                                               \
+  _p_MemCmp_Bitmask_LengthFive(actionS);     \
+  _p_MemCmp_Bitmask(5, actionS);                \
+}                                               \
+while (0)
+
+#define _p_MemCmp_Bitmask_LengthSeven(actionS)  \
+  do                                            \
+{                                               \
+  _p_MemCmp_Bitmask_LengthSix(actionS);      \
+  _p_MemCmp_Bitmask(6, actionS);                \
+}                                               \
+while (0)
+
+#define _p_MemCmp_Bitmask_LengthEight(actionS)  \
+do                                              \
+{                                               \
+  _p_MemCmp_Bitmask_LengthSeven(actionS);    \
+  _p_MemCmp_Bitmask(7, actionS);                \
+}                                               \
+while (0)
+
+#define p_MemCmp_Bitmask_LengthZero(s1, s2, bitmask, length, actionG, actionS) actionG
+
+#define p_MemCmp_Bitmask_LengthOne(s1, s2, bitmask, length, actionG, actionS)   \
+do                                                                              \
+{                                                                               \
+  _p_MemCmp_Bitmask_Declare(s1, s2, bitmask);                                         \
+  _p_MemCmp_Bitmask(0, actionS);                                                \
+  actionG;                                                                      \
+}                                                                               \
+while (0)
+
+#define p_MemCmp_Bitmask_LengthTwo(s1, s2, bitmask, length, actionG, actionS)   \
+do                                                                              \
+{                                                                               \
+  _p_MemCmp_Bitmask_Declare(s1, s2, bitmask);                                         \
+  _p_MemCmp_Bitmask_LengthTwo(actionS);                                         \
+  actionG;                                                                      \
+}                                                                               \
+while (0)
+
+#define p_MemCmp_Bitmask_LengthThree(s1, s2, bitmask, length, actionG, actionS)   \
+do                                                                              \
+{                                                                               \
+  _p_MemCmp_Bitmask_Declare(s1, s2, bitmask);                                         \
+  _p_MemCmp_Bitmask_LengthThree(actionS);                                         \
+  actionG;                                                                      \
+}                                                                               \
+while (0)
+
+#define p_MemCmp_Bitmask_LengthFour(s1, s2, bitmask, length, actionG, actionS)   \
+do                                                                              \
+{                                                                               \
+  _p_MemCmp_Bitmask_Declare(s1, s2, bitmask);                                         \
+  _p_MemCmp_Bitmask_LengthFour(actionS);                                         \
+  actionG;                                                                      \
+}                                                                               \
+while (0)
+
+#define p_MemCmp_Bitmask_LengthFive(s1, s2, bitmask, length, actionG, actionS)   \
+do                                                                              \
+{                                                                               \
+  _p_MemCmp_Bitmask_Declare(s1, s2, bitmask);                                         \
+  _p_MemCmp_Bitmask_LengthFive(actionS);                                         \
+  actionG;                                                                      \
+}                                                                               \
+while (0)
+
+#define p_MemCmp_Bitmask_LengthSix(s1, s2, bitmask, length, actionG, actionS)   \
+do                                                                              \
+{                                                                               \
+  _p_MemCmp_Bitmask_Declare(s1, s2, bitmask);                                         \
+  _p_MemCmp_Bitmask_LengthSix(actionS);                                         \
+  actionG;                                                                      \
+}                                                                               \
+while (0)
+
+#define p_MemCmp_Bitmask_LengthSeven(s1, s2, bitmask, length, actionG, actionS) \
+do                                                                              \
+{                                                                               \
+  _p_MemCmp_Bitmask_Declare(s1, s2, bitmask);                                         \
+  _p_MemCmp_Bitmask_LengthSeven(actionS);                                       \
+  actionG;                                                                      \
+}                                                                               \
+while (0)
+
+#define p_MemCmp_Bitmask_LengthEigth(s1, s2, bitmask, length, actionG, actionS) \
+do                                                                              \
+{                                                                               \
+  _p_MemCmp_Bitmask_Declare(s1, s2, bitmask);                                         \
+  _p_MemCmp_Bitmask_LengthEigth(actionS);                                       \
+  actionG;                                                                      \
+}                                                                               \
+while (0)
+
+
 #endif // P_MEM_CMP

Singular/p_Merge_q__Template.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Merge_q__Template.cc,v 1.3 2000-12-07 15:03:58 obachman Exp $
+ *  Version: $Id: p_Merge_q__Template.cc,v 1.4 2000-12-31 15:14:38 obachman Exp $
  *******************************************************************/
 
@@ -36 +36 @@
   // should never get here
   dReportError("Equal monomials in p_Merge_q");
-  goto Finish;
-     
+  return NULL;
+  
   Greater:
   a = pNext(a) = p;

Singular/p_Mult_q.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_q.cc,v 1.6 2000-11-23 17:34:11 obachman Exp $
+ *  Version: $Id: p_Mult_q.cc,v 1.7 2000-12-31 15:14:38 obachman Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -20 +20 @@
 #include "p_Procs.h"
 #include "p_Numbers.h"
-
-
-poly _p_Mult_q(poly p, poly q, const int copy, const ring r)
+#include "kbuckets.h"
+
+#include "p_Mult_q.h"
+
+BOOLEAN pqLength(poly p, poly q, int &lp, int &lq, const int min)
+{
+  int l = 0;
+  
+  do
+  {
+    if (p == NULL)
+    {
+      lp = l;
+      if (l < min)
+      {
+        if (q != NULL)
+          lq = l+1;
+        else
+          lq = l;
+        return FALSE;
+      }
+      lq = l + pLength(q);
+      return TRUE;
+    }
+    pIter(p);
+    if (q == NULL)
+    {
+      lq = l;
+      if (l < min)
+      {
+        lp = l+1;
+        return FALSE;
+      }
+      lp = l + 1 + pLength(p);
+      return TRUE;
+    }
+    pIter(q);
+    l++;
+  }
+  while (1);
+}
+
+      
+static poly _p_Mult_q_Bucket(poly p, const int lp, 
+                             poly q, const int lq, 
+                             const int copy, const ring r)
+{
+  assume(p != NULL && pNext(p) != NULL && q != NULL && pNext(q) != NULL);
+  pAssume1(! pHaveCommonMonoms(p, q));
+  assume(lp >= 1 && lq >= 1);
+  p_Test(p, r);
+  p_Test(q, r);
+
+  poly res = pp_Mult_mm(p,q,r);     // holds initially q1*p
+  poly qq = pNext(q);               // we iter of this
+  poly qn = pp_Mult_mm(qq, p,r);    // holds p1*qi
+  poly pp = pNext(p);               // used for Lm(qq)*pp
+  poly rr = res;                    // last monom which is surely not NULL
+  poly rn = pNext(res);             // pNext(rr)
+  number n, n1;
+  
+  kBucket_pt bucket = kBucketCreate(r);
+  
+  // initialize bucket
+  kBucketInit(bucket, pNext(rn), lp - 2);
+  pNext(rn) = NULL;
+
+  // now the main loop
+  Top:
+  if (rn == NULL) goto Smaller;
+  p_LmCmpAction(rn, qn, r, goto Equal, goto Greater, goto Smaller);
+  
+  Greater:
+  // rn > qn, so iter
+  rr = rn;
+  pNext(rn) = kBucketExtractLm(bucket);
+  pIter(rn);
+  goto Top;
+  
+  // rn < qn, append qn to rr, and compute next Lm(qq)*pp
+  Smaller:
+  pNext(rr) = qn;
+  rr = qn;
+  pIter(qn);
+  Work: // compute res + Lm(qq)*pp
+  if (rn == NULL)
+  {
+    pNext(rr) = pp_Mult_mm(pp, qq, r);
+    kBucketInit(bucket, pNext(pNext(rr)), lp - 2);
+    pNext(pNext(rr)) = NULL;
+  }
+  else
+  {
+    kBucketSetLm(bucket, rn);
+    kBucket_Plus_mm_Mult_pp(bucket, qq, pp, lp - 1);
+    pNext(rr) = kBucketExtractLm(bucket);
+  }
+  
+  pIter(qq);
+  if (qq == NULL) goto Finish;
+  rn = pNext(rr);
+  goto Top;
+  
+  Equal:
+  n1 = pGetCoeff(rn);
+  n = n_Add(n1, pGetCoeff(qn), r);
+  n_Delete(&n1, r);
+  if (n_IsZero(n, r))
+  {
+    n_Delete(&n, r);
+    p_LmFree(rn, r);
+  }
+  else
+  {
+    pSetCoeff0(rn, n);
+    rr = rn;
+  }
+  rn = kBucketExtractLm(bucket);
+  n_Delete(&pGetCoeff(qn),r);
+  qn = p_LmFreeAndNext(qn, r);
+  goto Work;
+  
+  Finish:
+  assume(rr != NULL && pNext(rr) != NULL);
+  pNext(pNext(rr)) = kBucketClear(bucket);
+  kBucketDestroy(&bucket);
+  
+  if (!copy)
+  {
+    p_Delete(&p, r);
+    p_Delete(&q, r);
+  }
+  p_Test(res, r);
+  return res;
+}
+
+
+static poly _p_Mult_q_Normal(poly p, poly q, const int copy, const ring r)
 {
   assume(p != NULL && pNext(p) != NULL && q != NULL && pNext(q) != NULL);
@@ -95 +230 @@
 }
 
+
+poly _p_Mult_q(poly p, poly q, const int copy, const ring r)
+{
+  int lp, lq, l;
+  poly pt;
+  
+  pqLength(p, q, lp, lq, MIN_LENGTH_BUCKET);
+  
+  if (lp < lq)
+  {
+    pt = p;
+    p =  q;
+    q = pt;
+    l = lp;
+    lp = lq;
+    lq = l;
+  }
+  if (lq < MIN_LENGTH_BUCKET || TEST_OPT_NOT_BUCKETS)
+    return _p_Mult_q_Normal(p, q, copy, r);
+  else
+  {
+    assume(lp == pLength(p));
+    assume(lq == pLength(q));
+    return _p_Mult_q_Bucket(p, lp, q, lq, copy, r);
+  }
+}

Singular/p_Procs.h

@@ -8 +8 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Procs.h,v 1.11 2000-12-07 15:03:59 obachman Exp $
+ *  Version: $Id: p_Procs.h,v 1.12 2000-12-31 15:14:39 obachman Exp $
  *******************************************************************/
 #ifndef P_PROCS_H
@@ -32 +32 @@
                                             const ring r, poly &last);
 typedef poly (*p_Neg_Proc_Ptr)(poly p, const ring r);
-typedef poly (*pp_Mult_Coeff_mm_DivSelect_Proc_Ptr)(poly p, const poly m, 
-                                                    const ring r);
+typedef poly (*pp_Mult_Coeff_mm_DivSelect_Proc_Ptr)(poly p, const poly m,
+                                                    int &shorter,const ring r);
+typedef poly (*pp_Mult_Coeff_mm_DivSelectMult_Proc_Ptr)
+  (poly p,const poly m, const poly a, const poly b, int &shorter,const ring r);
+
 typedef poly (*p_Merge_q_Proc_Ptr)(poly p, poly q, const ring r);
 typedef void (*p_kBucketSetLm_Proc_Ptr)(kBucket_pt bucket);
@@ -51 +54 @@
   p_Neg_Proc_Ptr                        p_Neg;
   pp_Mult_Coeff_mm_DivSelect_Proc_Ptr   pp_Mult_Coeff_mm_DivSelect;
+  pp_Mult_Coeff_mm_DivSelectMult_Proc_Ptr   pp_Mult_Coeff_mm_DivSelectMult;
   p_Merge_q_Proc_Ptr                    p_Merge_q;
   p_kBucketSetLm_Proc_Ptr               p_kBucketSetLm;

Singular/p_Procs_Dynamic.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Dynamic.cc,v 1.2 2000-12-12 08:44:49 obachman Exp $
+ *  Version: $Id: p_Procs_Dynamic.cc,v 1.3 2000-12-31 15:14:39 obachman Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -105 +105 @@
       case pp_Mult_Coeff_mm_DivSelect_Proc: 
         return pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral;
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc: 
+        return pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral;
       case p_Merge_q_Proc: 
         return p_Merge_q__FieldGeneral_LengthGeneral_OrdGeneral;
@@ -147 +149 @@
       case pp_Mult_Coeff_mm_DivSelect_Proc: 
         return "pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral";
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc: 
+        return "pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral";
       case p_Merge_q_Proc: 
         return "p_Merge_q__FieldGeneral_LengthGeneral_OrdGeneral";

Singular/p_Procs_Generate.cc

@@ -8 +8 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Procs_Generate.cc,v 1.3 2000-12-20 17:20:02 obachman Exp $
+ *  Version: $Id: p_Procs_Generate.cc,v 1.4 2000-12-31 15:14:39 obachman Exp $
  *******************************************************************/
 
@@ -70 +70 @@
 
 const char* macros_length[] =
-{"p_MemCopy", "p_MemAdd", "p_MemSum", NULL};
+{"p_MemCopy", "p_MemAdd", "p_MemSum", "p_MemDiff", NULL};
 
 const char* macros_length_ord[] = {"p_MemCmp", NULL};
@@ -147 +147 @@
   {
     printf("#define DECLARE_LENGTH(what) what\n");
-    printf("#define p_MemAddAdjust(p, r) p_MemAdd_NegWeightAdjust(p, r)\n");
+    if (proc != pp_Mult_Coeff_mm_DivSelectMult_Proc)
+      printf("#define p_MemAddAdjust(p, r) p_MemAdd_NegWeightAdjust(p, r)\n");
+    else
+      printf("#define p_MemAddAdjust(p, r) ((void)0)\n");
   }
   
@@ -156 +159 @@
   else
     printf("#define DECLARE_ORDSGN(what) what\n");
+
+  if (proc == pp_Mult_Coeff_mm_DivSelectMult_Proc)
+  {
+    printf("#undef DECLARE_LENGTH_2\n");
+    printf("#undef p_MemCmp_Bitmask_2\n");
+    if (length != LengthGeneral)
+    {
+      printf("#define DECLARE_LENGTH_2(what) ((void)0)\n");
+      if (length < LengthTwo)
+        printf("#define p_MemCmp_Bitmask_2 p_MemCmp_Bitmask_%s\n", p_LengthEnum_2_String((p_Length) ((int) length + 2)));
+      else
+      printf("#define p_MemCmp_Bitmask_2 p_MemCmp_Bitmask_LengthZero\n");
+    }
+    else
+    {
+      printf("#define DECLARE_LENGTH_2(what) what \n");
+      printf("#define p_MemCmp_Bitmask_2 p_MemCmp_Bitmask_LengthGeneral\n");
+    }
+    
+      
+    printf("#undef p_MemAddAdjust\n");
+    printf("#define p_MemAddAdjust(p, r) ((void)0)\n");
+  }
 
   printf("#undef %s\n#define %s %s\n", s_what, s_what, s_full_proc_name);

Singular/p_Procs_Impl.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Impl.h,v 1.3 2000-12-20 17:18:52 obachman Exp $
+ *  Version: $Id: p_Procs_Impl.h,v 1.4 2000-12-31 15:14:39 obachman Exp $
  *******************************************************************/
 #ifndef P_PROCS_IMPL_H
@@ -188 +188 @@
   p_Neg_Proc,
   pp_Mult_Coeff_mm_DivSelect_Proc,
+  pp_Mult_Coeff_mm_DivSelectMult_Proc,
   p_Merge_q_Proc,
   p_kBucketSetLm_Proc,
@@ -277 +278 @@
       case p_Neg_Proc: return "p_Neg_Proc";
       case pp_Mult_Coeff_mm_DivSelect_Proc: return "pp_Mult_Coeff_mm_DivSelect_Proc";
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc: return "pp_Mult_Coeff_mm_DivSelectMult_Proc";
       case p_Merge_q_Proc: return "p_Merge_q_Proc";
       case p_kBucketSetLm_Proc: return "p_kBucketSetLm_Proc";
@@ -519 +521 @@
         pp_Mult_mm_Noether_Filter(field, length, ord);
         break;
-        
+
+        case pp_Mult_Coeff_mm_DivSelectMult_Proc:
+          if (length == LengthOne)
+          {
+            field = FieldGeneral;
+            length = LengthGeneral;
+            ord = OrdGeneral;
+            return;
+          }
+          break;
+          
       default: break;
   }
@@ -590 +602 @@
       case pp_Mult_nn_Proc:
       case pp_Mult_Coeff_mm_DivSelect_Proc:
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc:
         return index(field, length);
 
@@ -627 +640 @@
 while (0)                                                   \
   
-#define SetProcs(field, length, ord)                                \
-do                                                                  \
-{                                                                   \
-  SetProc(p_Delete, field, LengthGeneral, OrdGeneral);              \
-  SetProc(p_Mult_nn, field, LengthGeneral, OrdGeneral);             \
-  SetProc(pp_Mult_nn, field, length, OrdGeneral);                   \
-  SetProc(p_ShallowCopyDelete, FieldGeneral, length, OrdGeneral);   \
-  SetProc(p_Copy, field, length, OrdGeneral);                       \
-  SetProc(pp_Mult_mm, field, length, OrdGeneral);                   \
-  SetProc(pp_Mult_mm_Noether, field, length, ord);                  \
-  SetProc(p_Mult_mm, field, length, OrdGeneral);                    \
-  SetProc(p_Add_q, field, length, ord);                             \
-  SetProc(p_Minus_mm_Mult_qq, field, length, ord);                  \
-  SetProc(p_kBucketSetLm, field, length, ord);                      \
-  SetProc(p_Neg, field, LengthGeneral, OrdGeneral);                 \
-  SetProc(pp_Mult_Coeff_mm_DivSelect, field, length, OrdGeneral);   \
-  SetProc(p_Merge_q, FieldGeneral, length, ord);                    \
-}                                                                   \
+#define SetProcs(field, length, ord)                                    \
+do                                                                      \
+{                                                                       \
+  SetProc(p_Delete, field, LengthGeneral, OrdGeneral);                  \
+  SetProc(p_Mult_nn, field, LengthGeneral, OrdGeneral);                 \
+  SetProc(pp_Mult_nn, field, length, OrdGeneral);                       \
+  SetProc(p_ShallowCopyDelete, FieldGeneral, length, OrdGeneral);       \
+  SetProc(p_Copy, field, length, OrdGeneral);                           \
+  SetProc(pp_Mult_mm, field, length, OrdGeneral);                       \
+  SetProc(pp_Mult_mm_Noether, field, length, ord);                      \
+  SetProc(p_Mult_mm, field, length, OrdGeneral);                        \
+  SetProc(p_Add_q, field, length, ord);                                 \
+  SetProc(p_Minus_mm_Mult_qq, field, length, ord);                      \
+  SetProc(p_kBucketSetLm, field, length, ord);                          \
+  SetProc(p_Neg, field, LengthGeneral, OrdGeneral);                     \
+  SetProc(pp_Mult_Coeff_mm_DivSelect, field, length, OrdGeneral);       \
+  SetProc(pp_Mult_Coeff_mm_DivSelectMult, field, length, OrdGeneral);   \
+  SetProc(p_Merge_q, FieldGeneral, length, ord);                        \
+}                                                                       \
 while (0)
 

Singular/p_Procs_Set.h

@@ -12 +12 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Set.h,v 1.2 2000-12-12 08:44:50 obachman Exp $
+ *  Version: $Id: p_Procs_Set.h,v 1.3 2000-12-31 15:14:40 obachman Exp $
  *******************************************************************/
 
@@ -114 +114 @@
 #endif
 
+#define CheckProc(which)                                    \
+do                                                          \
+{                                                           \
+  if (p_Procs->which == NULL)                               \
+  {                                                         \
+    dReportBug("p_Procs is NULL");                          \
+    Warn("Singular will work properly, but much slower");   \
+    p_Procs->which = (which##_Proc_Ptr)                     \
+      which##__FieldGeneral_LengthGeneral_OrdGeneral;       \
+  }                                                         \
+}                                                           \
+while (0)
+
 // Choose a set of p_Procs
 void p_ProcsSet(ring r, p_Procs_s* p_Procs)
@@ -130 +143 @@
   InitSetProcs(field, length, ord);
   SetProcs(field, length, ord);
-  assume(
-    (p_Procs->p_Delete != NULL) &&
-    (p_Procs->p_ShallowCopyDelete != NULL) &&
-    (p_Procs->p_Mult_nn != NULL) &&
-    (p_Procs->pp_Mult_nn != NULL) &&
-    (p_Procs->p_Copy != NULL) &&
-    (p_Procs->pp_Mult_mm != NULL) &&
-    (p_Procs->pp_Mult_mm_Noether != NULL) &&
-    (p_Procs->p_Mult_mm != NULL) &&
-    (p_Procs->p_Add_q != NULL) &&
-    (p_Procs->p_Neg != NULL) &&
-    (p_Procs->pp_Mult_Coeff_mm_DivSelect != NULL) &&
-    (p_Procs->p_Merge_q != NULL) &&
-    (p_Procs->p_kBucketSetLm != NULL) &&
-    (p_Procs->p_Minus_mm_Mult_qq != NULL));
+  CheckProc(p_Copy);
+  CheckProc(p_Delete);
+  CheckProc(p_ShallowCopyDelete);
+  CheckProc(p_Mult_nn);
+  CheckProc(pp_Mult_nn);
+  CheckProc(pp_Mult_mm);
+  CheckProc(pp_Mult_mm_Noether);
+  CheckProc(p_Mult_mm);
+  CheckProc(p_Add_q);
+  CheckProc(p_Minus_mm_Mult_qq);
+  CheckProc(p_Neg);
+  CheckProc(pp_Mult_Coeff_mm_DivSelect);
+  CheckProc(pp_Mult_Coeff_mm_DivSelectMult);
+  CheckProc(p_Merge_q);
+  CheckProc(p_kBucketSetLm);
+
   assume(p_Procs->pp_Mult_mm_Noether != pp_Mult_mm_Noether__FieldGeneral_LengthGeneral_OrdGeneral || 
          p_Procs->p_Minus_mm_Mult_qq == p_Minus_mm_Mult_qq__FieldGeneral_LengthGeneral_OrdGeneral || 

Singular/p_Procs_Static.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Static.cc,v 1.2 2000-12-12 08:44:50 obachman Exp $
+ *  Version: $Id: p_Procs_Static.cc,v 1.3 2000-12-31 15:14:40 obachman Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -19 +19 @@
 #include "p_MemCopy.h"
 #include "kbuckets.h"
+#include "dError.h"
 
 BOOLEAN p_procs_dynamic = FALSE;
 
+#define p_Procs_Static
 #include "p_Procs_Static.inc"
 

Singular/p_polys.h

@@ -8 +8 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 9/00
- *  Version: $Id: p_polys.h,v 1.18 2000-12-20 11:15:47 obachman Exp $
+ *  Version: $Id: p_polys.h,v 1.19 2000-12-31 15:14:40 obachman Exp $
  *******************************************************************/
 #ifndef P_POLYS_H
@@ -185 +185 @@
 // i.e., test if all exponents are zero 
 PINLINE1 BOOLEAN p_LmIsConstantComp(const poly p, const ring r);
+PINLINE1 BOOLEAN p_LmIsConstant(const poly p, const ring r);
+
 // return TRUE, if p_LmExpVectorAdd stays within ExpBound of ring r,
 //       FALSE, otherwise
@@ -211 +213 @@
 // return the total degree of the long var l containing number_of_exp exponents
 PINLINE2 unsigned long p_GetTotalDegree(const unsigned long l, const ring r, const int number_of_exps);
+
+
+// like the respective p_LmIs* routines, except that p might be empty
+PINLINE1 BOOLEAN p_IsConstantComp(const poly p, const ring r);
+PINLINE1 BOOLEAN p_IsConstant(const poly p, const ring r);
+PINLINE0 BOOLEAN p_IsConstantPoly(const poly p, const ring r);
 
 // return TRUE if all monoms have the same component
@@ -279 +287 @@
 PINLINE2 poly p_Plus_mm_Mult_qq(poly p, poly m, poly q, const ring r);
 
+// returns p + m*q destroys p, const: q, m
+PINLINE2 poly p_Plus_mm_Mult_qq(poly p, poly m, poly q, int &lp, int lq, 
+                                const ring r);
+
 // returns p*q, destroys p and q
 PINLINE2 poly p_Mult_q(poly p, poly q, const ring r);
@@ -287 +299 @@
 PINLINE2 poly pp_Mult_Coeff_mm_DivSelect(poly p, const poly m, const ring r);
 
+// returns p*Coeff(m) for such monomials pm of p, for which m is divisble by pm
+// if lp is length of p on input then lp is length of returned poly on output
+PINLINE2 poly pp_Mult_Coeff_mm_DivSelect(poly p, int &lp, const poly m, const ring r);
+
 // returns merged p and q, assumes p and q have no monomials which are equal
 PINLINE2 poly p_Merge_q(poly p, poly c, const ring r);
+// sorts p using bucket sort: returns sorted poly
+// assumes that monomials of p are all different
+// reverses it first, if revert == TRUE, use this if input p is "almost" sorted
+// correctly
+PINLINE2 poly p_SortMerge(poly p, const ring r, BOOLEAN revert = FALSE);
+// like SortMerge, except that p may have equal monimals
+PINLINE2 poly p_SortAdd(poly p, const ring r, BOOLEAN revert = FALSE);
 
 /***************************************************************
@@ -301 +324 @@
 #define p_SetmComp  p_Setm
 
-// reverses the monomials of p
-PINLINE0   void p_SetCompP(poly a, int i, ring r);
-PINLINE0   void p_SetCompP(poly a, int i, ring lmRing, ring tailRing);
+// sets component of poly a to i, returns length of a
+PINLINE0   int p_SetCompP(poly a, int i, ring r);
+PINLINE0   int p_SetCompP(poly a, int i, ring lmRing, ring tailRing);
 PINLINE0   long p_MaxComp(poly p, ring lmRing, ring tailRing);
 inline long p_MaxComp(poly p,ring lmRing) {return p_MaxComp(p,lmRing,lmRing);}

Singular/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.74 2000-12-20 11:15:47 obachman Exp $ */
+/* $Id: polys.cc,v 1.75 2000-12-31 15:14:41 obachman Exp $ */
 
 /*
@@ -231 +231 @@
 poly pHomogen (poly p, int varnum)
 {
-  poly q=NULL;
-  poly res;
+  poly q=NULL, qn;
   int  o,ii;
+  sBucket_pt bp;
 
   if (p!=NULL)
@@ -250 +250 @@
     }
     q = pCopy(p);
-    res = q;
+    bp = sBucketCreate(currRing);
     while (q != NULL)
     {
@@ -259 +259 @@
         pSetm(q);
       }
-      pIter(q);
-    }
-    q = pOrdPolyInsertSetm(res);
+      qn = pNext(q);
+      pNext(q) = NULL;
+      sBucket_Add_p(bp, q, 1);
+      q = qn;
+    }
+    sBucketDestroyAdd(bp, &q, &ii);
   }
   return q;

Singular/polys.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.h,v 1.51 2000-12-20 11:15:48 obachman Exp $ */
+/* $Id: polys.h,v 1.52 2000-12-31 15:14:41 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate polynomials of the
@@ -209 +209 @@
 // p*Coeff(m) for such monomials pm of p, for which m is divisble by pm
 #define ppMult_Coeff_mm_DivSelect(p, m)   pp_Mult_Coeff_mm_DivSelect(p, m, currRing)
+/*************************************************************************
+ *
+ * Sort routines
+ *
+ *************************************************************************/
+// sorts p, assumes all monomials in p are different
+#define pSortMerger(p)          pSort(p)
+#define pSort(p)                p_SortMerge(p, currRing)
+
+// sorts p, p may have equal monomials
+#define pSortAdd(p)             p_SortAdd(p, currRing)
+
+
+// Assume: If considerd only as poly in any component of p 
+// (say, monomials of other components of p are set to 0), 
+// then p is already sorted correctly 
+#define pSortCompCorrect(p) pSort(p)
+
 /***************************************************************
  *
@@ -214 +232 @@
  *
  ***************************************************************/
-#define pLmIsConstantComp(p)        p_LmIsConstantComp(p, currRing)
+// return true if all p is eihter NULL, or if all exponents
+// of p are 0 and Comp of p is zero
+#define   pIsConstantComp(p)        p_IsConstantComp(p, currRing)
+// like above, except that Comp might be != 0
+#define   pIsConstant(p)            p_IsConstant(p,currRing)
+// like above, except that p must be != NULL
+#define   pLmIsConstantComp(p)      p_LmIsConstantComp(p, currRing)
+#define   pLmIsConstant(p)          p_LmIsConstant(p,currRing)
+
+// return TRUE if all monomials of p are constant
+#define   pIsConstantPoly(p)        p_IsConstantPoly(p, currRing)
+
+#define   pIsPurePower(p)   p_IsPurePower(p, currRing)
+#define   pIsVector(p)      (pGetComp(p)>0)
 
 
@@ -235 +266 @@
 
 /*-------------predicate on polys ----------------------*/
-BOOLEAN   p_IsConstant(const poly p, const ring r);
-#define   pIsConstant(p)    p_IsConstant(p,currRing)
-BOOLEAN   pIsConstantPoly(poly p);
-#define   pIsPurePower(p)   p_IsPurePower(p, currRing)
-#define   pIsVector(p)      (pGetComp(p)>0)
 BOOLEAN   pHasNotCF(poly p1, poly p2);   /*has no common factor ?*/
 void      pSplit(poly p, poly * r);   /*p => IN(p), r => REST(p) */
@@ -347 +373 @@
 // the leading monomial of p2 in p1
 void      pCancelPolyByMonom (poly p1,poly p2,polyset * P,int * SizeOfSet);
-
-// orders monoms of poly using insertion sort, performs pSetm on each
-// monom (i.e. sets Order field)
-poly      pOrdPolyInsertSetm(poly p);
-
-// orders monoms of poly using merge sort (ususally faster than
-// insertion sort). ASSUMES that pSetm was performed on monoms
-// (i.e. that Order field is set correctly)
-poly      pOrdPolyMerge(poly p);
 
 poly      pPermPoly (poly p, int * perm, ring OldRing, nMapFunc nMap,

Singular/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.60 2000-12-20 11:23:47 Singular Exp $ */
+/* $Id: polys1.cc,v 1.61 2000-12-31 15:14:42 obachman Exp $ */
 
 /*
@@ -27 +27 @@
 #include "clapsing.h"
 #endif
-
-/*-------- several access procedures to monomials -------------------- */
-/*2
-*test if the monomial is a constant
-*/
-BOOLEAN   p_IsConstant(const poly p, const ring r)
-{
-  if (p!=NULL)
-  {
-    int i;
-    for (i=r->N;i;i--)
-    {
-      if (p_GetExp(p,i,r)!=0) return FALSE;
-    }
-    if (p_GetComp(p,r)>0) return FALSE;
-  }
-  return TRUE;
-}
-
-/*2
-*test if the polynom is a constant
-*/
-BOOLEAN   pIsConstantPoly(poly p)
-{
-  while(p!=NULL)
-  {
-    for (int i=pVariables;i;i--)
-    {
-      if (pGetExp(p,i)!=0) return FALSE;
-    }
-    pIter(p);
-  }
-  return TRUE;
-}
-
 
 
@@ -739 +704 @@
 }
 
-// orders monoms of poly using merge sort (ususally faster than
-// insertion sort). ASSUMES that pSetm was performed on monoms
-poly pOrdPolyMerge(poly p)
-{
-  poly qq,pp,result=NULL;
-
-  if (p == NULL) return NULL;
-
-  loop
-  {
-    qq = p;
-    loop
-    {
-      if (pNext(p) == NULL)
-      {
-        result=pAdd(result, qq);
-        pTest(result);
-        return result;
-      }
-      if (pLmCmp(p,pNext(p)) != 1)
-      {
-        pp = p;
-        pIter(p);
-        pNext(pp) = NULL;
-        result = pAdd(result, qq);
-        break;
-      }
-      pIter(p);
-    }
-  }
-}
-
-// orders monoms of poly using insertion sort, performs pSetm on each monom
-poly pOrdPolyInsertSetm(poly p)
-{
-  poly qq,result = NULL;
-
-#if 0
-  while (p != NULL)
-  {
-    qq = p;
-    pIter(p);
-    qq->next = NULL;
-    pSetm(qq);
-    result = pAdd(result,qq);
-    pTest(result);
-  }
-#else
-  while (p != NULL)
-  {
-    qq = p;
-    pIter(p);
-    qq->next = result;
-    result = qq;
-    pSetm(qq);
-  }
-  p = result;
-  result = NULL;
-  while (p != NULL)
-  {
-    qq = p;
-    pIter(p);
-    qq->next = NULL;
-    result = pAdd(result, qq);
-  }
-  pTest(result);
-#endif
-  return result;
-}
 
 /*2
@@ -921 +817 @@
     }
   }
-  result=pOrdPolyMerge(result);
+  result=pSortAdd(result);
 #else
   //  if (qq!=NULL)

Singular/pp_Mult_Coeff_mm_DivSelect__Template.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pp_Mult_Coeff_mm_DivSelect__Template.cc,v 1.4 2000-12-07 15:04:01 obachman Exp $
+ *  Version: $Id: pp_Mult_Coeff_mm_DivSelect__Template.cc,v 1.5 2000-12-31 15:14:42 obachman Exp $
  *******************************************************************/
 
@@ -17 +17 @@
  *
  ***************************************************************/
-LINKAGE poly pp_Mult_Coeff_mm_DivSelect(poly p, const poly m, const ring r)
+LINKAGE poly pp_Mult_Coeff_mm_DivSelect(poly p, const poly m, int &shorter, 
+                                        const ring r)
 {
   number n = pGetCoeff(m);
@@ -24 +25 @@
   if (p == NULL) return NULL;
   spolyrec rp;
+  DECLARE_LENGTH(const unsigned long length = r->ExpL_Size);
+  int Shorter = 0;
   poly q = &rp;
   omBin bin = r->PolyBin;
-  DECLARE_LENGTH(const unsigned long length = r->ExpL_Size);
 
   do
@@ -38 +40 @@
       p_MemCopy(q->exp, p->exp, length);
     }
+    else
+    {
+      Shorter++;
+    }
     pIter(p);
   }
@@ -43 +49 @@
   pNext(q) = NULL;
 
+  shorter = Shorter;
   p_Test(rp.next, r);
   return rp.next;

Singular/prCopy.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: prCopy.cc,v 1.10 2000-12-08 14:43:46 Singular Exp $ */
+/* $Id: prCopy.cc,v 1.11 2000-12-31 15:14:43 obachman Exp $ */
 /*
 * ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
@@ -14 +14 @@
 #include "ring.h"
 #include "ideals.h"
-
-// define to 0 to never revert, 
-//           1 to always revert
-// undef if revert as given by parameter
-// #define REVERT 0
-
-// a sorting of polys based on buckets
-class pBucketPoly
-{
-public:
-  poly p;
-  long length;
-  long max_length;
-};
-
-static inline poly p_BucketSort(poly p, const ring r)
-{
-#if PDEBUG > 0
-  long l_orig = pLength(p);
-#endif
-  
-  long max_length = 1;
-  long i;
-  long l_p;
-  pBucketPoly buckets[BIT_SIZEOF_LONG - 3];
-  poly q;
-
-  buckets[0].p = p;
-  buckets[0].length = 1;
-  buckets[0].max_length = 2;
-  q = pNext(p);
-  pNext(buckets[0].p) = NULL;
-
-  while (q != NULL)
-  {
-    p = q;
-    pIter(q);
-    pNext(p) = NULL;
-    i = 0;
-    l_p = 1;
-    while (1)
-    {
-      if (buckets[i].p == NULL)
-      {
-        buckets[i].p = p;
-        buckets[i].length = l_p;
-        break;
-      }
-      buckets[i].p = p_Merge_q(buckets[i].p, p, r);
-      buckets[i].length += l_p;
-      if (buckets[i].length <= buckets[i].max_length)
-        break;
-      p = buckets[i].p;
-      l_p = buckets[i].length;
-      buckets[i].p = NULL;
-      buckets[i].length = 0;
-      i++;
-      if (i == max_length)
-      {
-        buckets[i].p = p;
-        buckets[i].length = l_p;
-        buckets[i].max_length = 1 << (i + 1);
-        max_length = i+1;
-        break;
-      }
-    }
-  }
-  
-  i = 0;
-  while (buckets[i].p == NULL) i++;
-  p = buckets[i].p;
-  for (i++; i<max_length; i++)
-  {
-    if (buckets[i].p != NULL)
-      p = p_Merge_q(buckets[i].p, p, r);
-  }
-
-  p_Test(p, r);
-#if PDEBUG > 0
-  assume(l_orig == pLength(p));
-#endif
-  return p;
-}
-
-// Sorts poly, reverts it first -- this way, almost sorted polys's
-// don't have n^2 sorting property
-poly prSortR(poly p, ring r, BOOLEAN revert)
-{
-  if (p == NULL) return NULL;
-  poly qq, result = NULL;
-
-#ifdef REVERT  
-#if REVERT == 1
-  revert = 1;
-#elif REVERT == 0
-  revert = 0;
-#endif
-#endif
-  if (revert)
-  {
-    // there must be a bug here: consider m1->m2
-    while (p != NULL)
-    {
-      qq = p;
-      pIter(p);
-      qq->next = result;
-      result = qq;
-    }
-    p = result;
-  }
-
-  return p_BucketSort(p, r);
-}
+#include "sbuckets.h"
 
 static inline void 
@@ -330 +218 @@
 }
 
-/////////////////////////////////////////////////////////////////////////
-// prDelete
-typedef void (*prDeleteProc_t)(poly &src_p, ring src_r);
-
-static inline void prDeleteR_NSimple(poly &p, ring r)
-{
-  poly next;
-  
-  while (p != NULL)
-  {
-    next = pNext(p);
-    omFreeBin(p, r->PolyBin);
-    p = next;
-  }
-}
-
-static inline void prDeleteR_NoNSimple(poly &p, ring r)
-{
-  poly next;
-  
-  while (p != NULL)
-  {
-    next = pNext(p);
-    nDelete(&pGetCoeff(p));
-    omFreeBin(p, r->PolyBin);
-    p = next;
-  }
-}
-
-void prDelete(poly &p)
-{
-  if (rField_has_simple_Alloc(currRing))
-    prDeleteR_NSimple(p, currRing);
-  else
-    prDeleteR_NoNSimple(p, currRing);
-}
-
-void prDeleteR(poly &p, ring r)
-{
-  if (rField_has_simple_Alloc(r))
-    prDeleteR_NSimple(p, r);
-  else
-    prDeleteR_NoNSimple(p, r);
-}
-
-
-static inline void idrDelete(ideal &id, ring r,  prDeleteProc_t prproc)
-{
-  if (id == NULL) return;
-  int i = IDELEMS(id);
-
-  for (; i>=0; i--)
-    prproc(id->m[i], r);
-  
-  omFreeSize(id->m, IDELEMS(id)*sizeof(poly));
-  omFreeBin(id, sip_sideal_bin);
-  id = NULL;
-}
-
-void idrDelete(ideal &id)
-{
-  prDeleteProc_t prproc;
-  if (rField_has_simple_Alloc(currRing))
-    prproc = prDeleteR_NSimple;
-  else
-    prproc = prDeleteR_NoNSimple;
-  
-  idrDelete(id, currRing, prproc);
-}
-
-void idrDeleteR(ideal &id, ring r)
-{
-  prDeleteProc_t prproc;
-  if (rField_has_simple_Alloc(r))
-    prproc = prDeleteR_NSimple;
-  else
-    prproc = prDeleteR_NoNSimple;
-  
-  idrDelete(id, r, prproc);
-}
-
-  
-  
-  

Singular/prCopy.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: prCopy.h,v 1.1 1999-11-15 17:20:42 obachman Exp $ */
+/* $Id: prCopy.h,v 1.2 2000-12-31 15:14:43 obachman Exp $ */
 /*
 * ABSTRACT - declarations of functions for Copy/Move/Delete for Polys
@@ -12 +12 @@
  * MoveR, CopyR, DeleteR, HeadR, SortR
  * Assume: ideal/poly from ring r
- *         Coef(r) == Coef(currRing)
+ *         Coeff(r) == Coeff(currRing)
  * Move, Delete: input object is destroyed and set to NULL
  *
- * Sort: revert == TRUE is faster for polys which are almost sorted correctly
  *
  ************************************************************************/
@@ -23 +22 @@
 poly prCopyR(poly p, ring r);
 poly prHeadR(poly p, ring r);
-void prDeleteR(poly &p, ring r);
-poly prSortR(poly p, ring r, BOOLEAN revert = TRUE);
-poly prMergeR(poly p1, poly p2, ring r);
 
 ideal idrMoveR_NoSort(ideal &id, ring r);
@@ -32 +28 @@
 ideal idrCopyR(ideal id, ring r);
 ideal idrHeadR(ideal id, ring r);
-void  idrDeleteR(ideal &id, ring r);
-
-/*************************************************************************
- *
- * Copy, Delete, Sort
- *
- *************************************************************************/
-
-inline poly pSort(poly p, BOOLEAN revert = TRUE)
-{
-  return prSortR(p, currRing, revert);
-}
-
-inline poly pMerge(poly p1, poly p2)
-{
-  return prMergeR(p1, p2, currRing);
-}
-
-/*************************************************************************
- *
- * Specialized sort routines
- *
- *************************************************************************/
-// TBC: 
-// Assume: If considerd only as poly in any component of p 
-// (say, monomials of other components of p are set to 0), 
-// then p is already sorted correctly 
-#define pSortCompCorrect(p) pSort(p, TRUE)
 
 
+
+

Singular/prCopyMacros.h

@@ -46 +46 @@
 #define PR_SORT_POLY(p, d_r, s_r) ((void)0)
 #else
-#define PR_SORT_POLY(p, d_r, s_r) p = prSortR(p, d_r, d_r->OrdSgn == s_r->OrdSgn)
+#define PR_SORT_POLY(p, d_r, s_r) p = p_SortMerge(p, d_r, d_r->OrdSgn == s_r->OrdSgn)
 #endif
 

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.152 2000-12-20 11:15:48 obachman Exp $ */
+/* $Id: ring.cc,v 1.153 2000-12-31 15:14:43 obachman Exp $ */
 
 /*
@@ -1991 +1991 @@
 }
 
+// return TRUE if p_SetComp requires p_Setm
+BOOLEAN rOrd_SetCompRequiresSetm(ring r)
+{
+  if (r->typ != NULL)
+  {
+    int pos;
+    for (pos=0;pos<r->OrdSize;pos++)
+    {
+      sro_ord* o=&(r->typ[pos]);
+      if (o->ord_typ == ro_syzcomp || o->ord_typ == ro_syz) return TRUE;
+    }
+  }
+  return FALSE;
+}
+
 // return TRUE if p->exp[r->pOrdIndex] holds total degree of p */
 BOOLEAN rOrd_is_Totaldegree_Ordering(ring r =currRing)

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.61 2000-12-14 16:38:55 obachman Exp $ */
+/* $Id: ring.h,v 1.62 2000-12-31 15:14:44 obachman Exp $ */
 
 /* includes */
@@ -231 +231 @@
 // return TRUE if p->exp[r->pOrdIndex] holds total degree of p */
 BOOLEAN rOrd_is_Totaldegree_Ordering(ring r =currRing);
+// return TRUE if p_SetComp requires p_Setm
+BOOLEAN rOrd_SetCompRequiresSetm(ring r);
 rOrderType_t    rGetOrderType(ring r);
 /* returns TRUE if var(i) belongs to p-block */
 BOOLEAN rIsPolyVar(int i, ring r = currRing); 
+
+inline BOOLEAN rOrd_is_c_dp(ring r)
+{
+  return (r->order[0] == ringorder_c && 
+          r->order[1] == ringorder_dp && 
+          r->order[2] == 0);
+}
 
 #ifdef HAVE_PLURAL

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.46 2000-12-06 11:03:30 Singular Exp $ */
+/* $Id: sparsmat.cc,v 1.47 2000-12-31 15:14:45 obachman Exp $ */
 
 /*
@@ -22 +22 @@
 #include "sparsmat.h"
 #include "prCopy.h"
-
-/* ----------------- general definitions ------------------ */
-/* in structs.h
-typedef struct smprec sm_prec;
-typedef sm_prec * smpoly;
-struct smprec{
-  smpoly n;            // the next element
-  int pos;             // position
-  int e;               // level
-  poly m;              // the element
-  float f;             // complexity of the element
-};
-*/
-
-#if OLD > 0
-static poly smSelectCopy(poly, const poly);
+#include "p_Procs.h"
+#include "kbuckets.h"
+#include "p_Mult_q.h"
+
+// define SM_NO_BUCKETS, if sparsemat stuff should not use buckets
+// #define SM_NO_BUCKETS
+
+// this is also influenced by TEST_OPT_NOTBUCKETS
+#ifndef SM_NO_BUCKETS
+// buckets do carry a small additional overhead: only use them if 
+// min-length of polys is >= SM_MIN_LENGTH_BUCKET
+#define SM_MIN_LENGTH_BUCKET MIN_LENGTH_BUCKET - 5
 #else
-#define smSelectCopy ppMult_Coeff_mm_DivSelect
+#define SM_MIN_LENGTH_BUCKET    INT_MAX
 #endif
+
 
 /* declare internal 'C' stuff */
@@ -58 +55 @@
 static BOOLEAN smHaveDenom(poly);
 static number smCleardenom(ideal);
+
+static poly pp_Mult_Coeff_mm_DivSelect_MultDiv(poly p, int &lp, poly m, 
+                                               poly a, poly b)
+{
+  if (rOrd_is_c_dp(currRing))
+  {
+    int shorter;
+    p = currRing->p_Procs->pp_Mult_Coeff_mm_DivSelectMult(p, m, a, b, 
+                                                          shorter, currRing);
+    lp -= shorter;
+  }
+  else
+  {
+    p = pp_Mult_Coeff_mm_DivSelect(p, lp, m, currRing);
+    smExpMultDiv(p, a, b);
+  }
+  return p;
+}
+
+static poly smSelectCopy_ExpMultDiv(poly p, poly m, poly a, poly b)
+{
+  int lp = 0;
+  return pp_Mult_Coeff_mm_DivSelect_MultDiv(p, lp, m, a, b);
+}
+
 
 /* class for sparse matrix:
@@ -134 +156 @@
 };
 
+Exponent_t smExpBound(ideal Id)
+{
+  Exponent_t max = 0;
+  long ldeg;
+  int dummy, i, n = IDELEMS(Id);
+  
+  for (i=0; i<n; i++)
+  {
+    if (Id->m[i] != NULL)
+    {
+      ldeg = pLDeg(Id->m[i], &dummy);
+      if (ldeg > max) max = ldeg;
+    }
+  }
+  return max*2*n;
+}
+
+// #define HOMOG_LP
 /* ----------------- ops with rings ------------------ */
 ideal smRingCopy(ideal I, ring *ri, sip_sring &tmpR)
@@ -139 +179 @@
   ring origR =NULL;
   ideal II;
-  if (currRing->order[0]!=ringorder_c)
-  {
-    origR =currRing;
-    tmpR=*origR;
-    int *ord=(int*)omAlloc0(3*sizeof(int));
-    int *block0=(int*)omAlloc(3*sizeof(int));
-    int *block1=(int*)omAlloc(3*sizeof(int));
-    ord[0]=ringorder_c;
+  origR =currRing;
+  tmpR=*origR;
+  int *ord=(int*)omAlloc0(3*sizeof(int));
+  int *block0=(int*)omAlloc(3*sizeof(int));
+  int *block1=(int*)omAlloc(3*sizeof(int));
+  ord[0]=ringorder_c;
+#ifdef HOMOG_LP
+  if (idHomIdeal(I))
+    ord[1] = ringorder_lp;
+  else
+#endif
     ord[1]=ringorder_dp;
-    tmpR.order=ord;
-    tmpR.OrdSgn=1;
-    block0[1]=1;
-    tmpR.block0=block0;
-    block1[1]=tmpR.N;
-    tmpR.block1=block1;
-    rComplete(&tmpR,1);
-    rChangeCurrRing(&tmpR);
-    // fetch data from the old ring
-    II=idInit(IDELEMS(I),I->rank);
-    int k;
-    for (k=0;k<IDELEMS(I);k++) II->m[k] = prCopyR( I->m[k], origR);
-  }
-  else
-  {
-    II=idCopy(I);
-  }
+  tmpR.order=ord;
+  tmpR.OrdSgn=1;
+  block0[1]=1;
+  tmpR.block0=block0;
+  block1[1]=tmpR.N;
+  tmpR.block1=block1;
+
+  tmpR.bitmask = smExpBound(I);
+
+  // unfortunately, we can not work (yet) with r->N == 0
+  if (tmpR.bitmask < 1) tmpR.bitmask = 1;
+  if (tmpR.bitmask > currRing->bitmask) tmpR.bitmask = currRing->bitmask;
+
+  rComplete(&tmpR,1);
+  rChangeCurrRing(&tmpR);
+  if (TEST_OPT_PROT)
+    Print("[%d:%d]", (long) tmpR.bitmask, tmpR.ExpL_Size);
+  // fetch data from the old ring
+  II = idrCopyR(I, origR);
+  idTest(II);
   *ri = origR;
   return II;
@@ -951 +997 @@
         {
           res = res->n = smElemCopy(b);
-          res->m = smMult(b->m, w);
+          res->m = ppMult_qq(b->m, w);
           res->e = 1;
           res->f = smPolyWeight(res);
@@ -966 +1012 @@
       {
         res = res->n = smElemCopy(b);
-        res->m = smMult(b->m, w);
+        res->m = ppMult_qq(b->m, w);
         res->e = 1;
         res->f = smPolyWeight(res);
@@ -973 +1019 @@
       else
       {
-        ha = smMult(a->m, p);
+        ha = ppMult_qq(a->m, p);
         pDelete(&a->m);
-        hb = smMult(b->m, w);
+        hb = ppMult_qq(b->m, w);
         ha = pAdd(ha, hb);
         if (ha != NULL)
@@ -1680 +1726 @@
 
 /* ----------------- arithmetic ------------------ */
-
-/*
-*  returns a*b
-*  a,b NOT destroyed
-*/
-poly smMult(poly a, poly b)
-{
-  poly pa, res, r;
-
-  if (smSmaller(a, b))
-  {
-    r = a;
-    a = b;
-    b = r;
-  }
-  if (pNext(b) == NULL)
-  {
-    if (pLmIsConstantComp(b))
-      return ppMult_nn(a, pGetCoeff(b));
-    else
-      return ppMult_mm(a, b);
-  }
-  pa = res = ppMult_mm(a, b);
-  pIter(b);
-  do
-  {
-    r = ppMult_mm(a, b);
-    smCombineChain(&pa, r);
-    pIter(b);
-  } while (b != NULL);
-  return res;
-}
-
 /*2
 * exact division a/b
@@ -1770 +1783 @@
 }
 
+#define X_MAS
+#ifdef X_MAS
+
 /*
 *  returns the part of (a*b)/exp(lead(c)) with nonegative exponents
@@ -1776 +1792 @@
 {
   poly pa, e, res, r;
-  BOOLEAN lead;
-
-  if (smSmaller(a, b))
+  BOOLEAN lead;\
+  int la, lb, lr;
+
+  if ((c == NULL) || pLmIsConstantComp(c))
+  {
+    return ppMult_qq(a, b);
+  }
+
+  pqLength(a, b, la, lb, SM_MIN_LENGTH_BUCKET);
+
+  // we iter over b, so, make sure b is the shortest
+  // such that we minimize our iterations
+  if (lb > la)
   {
     r = a;
     a = b;
     b = r;
-  }
-  if ((c == NULL) || pLmIsConstantComp(c))
-  {
-    if (pNext(b) == NULL)
-    {
-      if (pLmIsConstantComp(b))
-        return ppMult_nn(a, pGetCoeff(b));
-      else
-        return ppMult_mm(a, b);
-    }
-    pa = res = ppMult_mm(a, b);
-    pIter(b);
-    do
-    {
-      r = ppMult_mm(a, b);
-      smCombineChain(&pa, r);
-      pIter(b);
-    } while (b != NULL);
-    return res;
+    lr = la;
+    la = lb;
+    lb = lr;
   }
   res = NULL;
@@ -1812 +1822 @@
     {
       lead = pLmDivisibleByNoComp(e, a);
-      r = smSelectCopy(a, e);
-      smExpMultDiv(r, b, c);
+      r = smSelectCopy_ExpMultDiv(a, e, b, c);
     }
     else
@@ -1842 +1851 @@
     }
   }
-  do
+  
+  if (!TEST_OPT_NOT_BUCKETS && lb >= SM_MIN_LENGTH_BUCKET)
+  {
+    // use buckets if minimum length is smaller than threshold
+    spolyrec rp;
+    poly append;
+    // find the last monomial before pa
+    if (res == pa)
+    {
+      append = &rp;
+      pNext(append) = res;
+    }
+    else
+    {
+      append = res;
+      while (pNext(append) != pa) 
+      {
+        assume(pNext(append) != NULL);
+        pIter(append);
+      }
+    }
+    kBucket_pt bucket = kBucketCreate(currRing);
+    kBucketInit(bucket, pNext(append), 0);
+    do
+    {
+      pSetCoeff0(e,pGetCoeff(b));
+      if (smIsNegQuot(e, b, c))
+      {
+        lr = la;
+        r = pp_Mult_Coeff_mm_DivSelect_MultDiv(a, lr, e, b, c);
+        if (pLmDivisibleByNoComp(e, a))
+          append = kBucket_ExtractLarger_Add_q(bucket, append, r, &lr);
+        else
+          kBucket_Add_q(bucket, r, &lr);
+      }
+      else
+      {
+        r = ppMult_mm(a, e);
+        append = kBucket_ExtractLarger_Add_q(bucket, append, r, &la);
+      }
+      pIter(b);
+    } while (b != NULL);
+    pNext(append) = kBucketClear(bucket);
+    kBucketDestroy(&bucket);
+  }
+  else
+  {
+    // use old sm stuff
+    do
+    {
+      pSetCoeff0(e,pGetCoeff(b));
+      if (smIsNegQuot(e, b, c))
+      {
+        r = smSelectCopy_ExpMultDiv(a, e, b, c);
+        if (pLmDivisibleByNoComp(e, a))
+          smCombineChain(&pa, r);
+        else
+          pa = pAdd(pa,r);
+      }
+      else
+      {
+        r = ppMult_mm(a, e);
+        smCombineChain(&pa, r);
+      }
+      pIter(b);
+    } while (b != NULL);
+  }
+  pLmFree(e);
+  return res;
+}
+
+#else
+
+/*
+*  returns the part of (a*b)/exp(lead(c)) with nonegative exponents
+*/
+poly smMultDiv(poly a, poly b, const poly c)
+{
+  poly pa, e, res, r;
+  BOOLEAN lead;
+
+  if ((c == NULL) || pLmIsConstantComp(c))
+  {
+    return ppMult_qq(a, b);
+  }
+  if (smSmaller(a, b))
+  {
+    r = a;
+    a = b;
+    b = r;
+  }
+  res = NULL;
+  e = pInit();
+  lead = FALSE;
+  while (!lead)
   {
     pSetCoeff0(e,pGetCoeff(b));
     if (smIsNegQuot(e, b, c))
     {
-      r = smSelectCopy(a, e);
-      smExpMultDiv(r, b, c);
+      lead = pLmDivisibleByNoComp(e, a);
+      r = smSelectCopy_ExpMultDiv(a, e, b, c);
+    }
+    else
+    {
+      lead = TRUE;
+      r = ppMult_mm(a, e);
+    }
+    if (lead)
+    {
+      if (res != NULL)
+      {
+        smFindRef(&pa, &res, r);
+        if (pa == NULL)
+          lead = FALSE;
+      }
+      else
+      {
+        pa = res = r;
+      }
+    }
+    else
+      res = pAdd(res, r);
+    pIter(b);
+    if (b == NULL)
+    {
+      pLmFree(e);
+      return res;
+    }
+  }
+  do
+  {
+    pSetCoeff0(e,pGetCoeff(b));
+    if (smIsNegQuot(e, b, c))
+    {
+      r = smSelectCopy_ExpMultDiv(a, e, b, c);
       if (pLmDivisibleByNoComp(e, a))
         smCombineChain(&pa, r);
@@ -1864 +2001 @@
   return res;
 }
-
+#endif
 /*n
 * exact division a/b
@@ -1880 +2017 @@
 }
 
+
 /* ------------ internals arithmetic ------------- */
 static void smExactPolyDiv(poly a, poly b)
@@ -1887 +2025 @@
   poly h;
   number y, yn;
-
-  do
-  {
-    y = nDiv(pGetCoeff(a), x);
-    nNormalize(y);
-    pSetCoeff(a,y);
-    yn = nNeg(nCopy(y));
-    pSetCoeff0(e,yn);
-    if (smIsNegQuot(e, a, b))
-    {
-      h = smSelectCopy(tail, e);
-      smExpMultDiv(h, a, b);
-    }
-    else
-      h = ppMult_mm(tail, e);
-    nDelete(&yn);
-    a = pNext(a) = pAdd(pNext(a), h);
-  } while (a!=NULL);
+  int lt = pLength(tail);
+
+  if (lt + 1 >= SM_MIN_LENGTH_BUCKET &&  !TEST_OPT_NOT_BUCKETS)
+  {
+    kBucket_pt bucket = kBucketCreate(currRing);
+    kBucketInit(bucket, pNext(a), 0);
+    int lh = 0;
+    do
+    {
+      y = nDiv(pGetCoeff(a), x);
+      nNormalize(y);
+      pSetCoeff(a,y);
+      yn = nNeg(nCopy(y));
+      pSetCoeff0(e,yn);
+      lh = lt;
+      if (smIsNegQuot(e, a, b))
+      {
+        h = pp_Mult_Coeff_mm_DivSelect_MultDiv(tail, lh, e, a, b);
+      }
+      else
+        h = ppMult_mm(tail, e);
+      nDelete(&yn);
+      kBucket_Add_q(bucket, h, &lh);
+    
+      a = pNext(a) = kBucketExtractLm(bucket);
+    } while (a!=NULL);
+    kBucketDestroy(&bucket);
+  }
+  else
+  {
+    do
+    {
+      y = nDiv(pGetCoeff(a), x);
+      nNormalize(y);
+      pSetCoeff(a,y);
+      yn = nNeg(nCopy(y));
+      pSetCoeff0(e,yn);
+      if (smIsNegQuot(e, a, b))
+        h = smSelectCopy_ExpMultDiv(tail, e, a, b);
+      else
+        h = ppMult_mm(tail, e);
+      nDelete(&yn);
+      a = pNext(a) = pAdd(pNext(a), h);
+    } while (a!=NULL);
+  }
   pLmFree(e);
 }
@@ -1940 +2105 @@
   pLmTest(b);
   pLmTest(c);
+  poly bc = p_New(currRing);
+  
+  p_ExpVectorDiff(bc, b, c, currRing);
+  
   while(t!=NULL)
   {
-    pExpVectorAddSub(t, b, c);
+    pExpVectorAdd(t, bc);
     pIter(t);
   }
-}
+  p_LmFree(bc, currRing);
+}
+
 
 static void smPolyDivN(poly a, const number x)
@@ -2016 +2187 @@
   *px = pa;
 }
+
 
 static void smFindRef(poly *ref, poly *px, poly r)

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.51 2000-12-20 11:15:49 obachman Exp $ */
+/* $Id: structs.h,v 1.52 2000-12-31 15:14:45 obachman Exp $ */
 /*
 * ABSTRACT
@@ -79 +79 @@
 class namerec;
 class kBucket;
+class sBucket;
 #endif
 
@@ -145 +146 @@
 typedef namerec *          namehdl;
 typedef kBucket*           kBucket_pt;
+typedef sBucket*           sBucket_pt;
 typedef struct p_Procs_s p_Procs_s;
 

Singular/syz0.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz0.cc,v 1.35 2000-12-06 11:03:31 Singular Exp $ */
+/* $Id: syz0.cc,v 1.36 2000-12-31 15:14:46 obachman Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -995 +995 @@
       {
         if (res[1]->m[i])
-          res[1]->m[i] = pOrdPolyMerge(res[1]->m[i]);
+          res[1]->m[i] = pSort(res[1]->m[i]);
       }
     }