Changeset 1caa72 in git


Ignore:
Timestamp:
Apr 6, 1998, 7:59:38 PM (26 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
9f9c432f0eded9cd7cfa4c8b1d6655d42f8fb900
Parents:
d336d53da70515a0ed2ed294fdce5f4768ee4d95
Message:
1998-04-06  Olaf Bachmann  <obachman@mathematik.uni-kl.de>

	* spSpolyLoop.h: neww calling interface for spGetSpolyLoop

	* kstd1.cc (kNF): moved strat->ak field initailization out of
	initBuchMora into single routines

	* febase.cc (feGetSearchPath): added feGetSearchPath; changed
	algorithm for searching files: $SINGULARPATH -> relative to
	executable -> burnt-in locations
	* added find_exec.c to get absolute pathname of executable


git-svn-id: file:///usr/local/Singular/svn/trunk@1341 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
1 added
19 edited

Legend:

Unmodified
Added
Removed
  • Singular/ChangeLog

    rd336d53 r1caa72  
     11998-04-06  Olaf Bachmann  <obachman@mathematik.uni-kl.de>
     2
     3        * spSpolyLoop.h: neww calling interface for spGetSpolyLoop
     4
     5        * kstd1.cc (kNF): moved strat->ak field initailization out of
     6        initBuchMora into single routines
     7
     8        * febase.cc (feGetSearchPath): added feGetSearchPath; changed
     9        algorithm for searching files: $SINGULARPATH -> relative to
     10        executable -> burnt-in locations
     11        * added find_exec.c to get absolute pathname of executable
     12
    113Mon Apr  6 14:23:52 1998  Jens Schmidt  <schmidt@mathematik.uni-kl.de>
    214
  • Singular/LIB/poly.lib

    rd336d53 r1caa72  
    1 // $Id: poly.lib,v 1.10 1998-04-03 22:47:09 krueger Exp $
     1// $Id: poly.lib,v 1.11 1998-04-06 17:59:38 obachman Exp $
    22//system("random",787422842);
    33//(GMG, last modified 22.06.96)
     
    55///////////////////////////////////////////////////////////////////////////////
    66
    7 version="$Id: poly.lib,v 1.10 1998-04-03 22:47:09 krueger Exp $";
     7version="$Id: poly.lib,v 1.11 1998-04-06 17:59:38 obachman Exp $";
    88info="
    99LIBRARY:  poly.lib      PROCEDURES FOR MANIPULATING POLYS, IDEALS, MODULES
     
    2222 normalize(poly/...);   normalize poly/... such that leading coefficient is 1
    2323 rad_con(p,I);          check radical containment of poly p in ideal I
    24            (parameters in square brackets [] are optional)
     24 content(f);            content of polynomial/vector f
     25          (parameters in square brackets [] are optional)
    2526";
    2627
  • Singular/Makefile.in

    rd336d53 r1caa72  
    9999    ndbm.cc spSpolyLoop.cc libparse.cc
    100100
    101 CSOURCES=mmalloc.c mmallocb.c mmallocs.c mmblock.c mmheap.c mmspec.c mmutil.c weight0.c
     101CSOURCES=mmalloc.c mmallocb.c mmallocs.c mmblock.c mmheap.c mmspec.c mmutil.c weight0.c find_exec.c
    102102
    103103SOURCES=${CSOURCES} ${CXXSOURCES} grammar.y scanner.l libparse.l spSpolyLoop.pl
     
    143143     algmap.o clapconv.o  clapmem.o clapsing.o claptmpl.o\
    144144     mpsr_Error.o mpsr_Put.o mpsr_PutPoly.o mpsr_GetPoly.o \
    145      mpsr_Get.o mpsr_GetMisc.o ndbm.o spSpolyLoop.o libparse.o
     145     mpsr_Get.o mpsr_GetMisc.o ndbm.o spSpolyLoop.o libparse.o \
     146     find_exec.o
    146147
    147148##
     
    394395     mpsr_Error.og mpsr_Put.og mpsr_PutPoly.og mpsr_GetPoly.og \
    395396     mpsr_Get.og mpsr_GetMisc.og \
    396      ndbm.og spSpolyLoop.og libparse.og
     397     ndbm.og spSpolyLoop.og libparse.og \
    397398
    398399OBJG2= mmalloc.og mmallocb.og mmallocs.og mmblock.og mmheap.og \
    399      mmspec.og mmutil.og weight0.og
     400     mmspec.og mmutil.og weight0.og find_exec.og
     401
    400402
    401403OBJG=$(OBJG1) $(OBJG2) claptmpl.og
     
    470472
    471473OBJP2= mmalloc.op mmallocb.op mmallocs.op mmblock.op mmheap.op \
    472      mmspec.op mmutil.op weight0.op
     474     mmspec.op mmutil.op weight0.op find_exec.op
    473475
    474476OBJP=$(OBJP1) $(OBJP2) claptmpl.op
     
    492494     mpsr_Error.ob mpsr_Put.ob mpsr_PutPoly.ob mpsr_GetPoly.ob \
    493495     mpsr_Get.ob mpsr_GetMisc.ob \
    494      ndbm.ob spSpolyLoop.ob libparse.ob
     496     ndbm.ob spSpolyLoop.ob libparse.ob 
    495497
    496498OBJB2= mmalloc.ob mmallocb.ob mmallocs.ob mmblock.ob mmheap.ob \
    497      mmspec.ob mmutil.ob weight0.ob
     499     mmspec.ob mmutil.ob weight0.ob find_exec.ob
    498500
    499501OBJB=$(OBJB1) $(OBJB2) claptmpl.ob
  • Singular/configure

    rd336d53 r1caa72  
    24152415fi
    24162416
     2417echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
     2418echo "configure:2419: checking whether stat file-mode macros are broken" >&5
     2419if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
     2420  echo $ac_n "(cached) $ac_c" 1>&6
     2421else
     2422  cat > conftest.$ac_ext <<EOF
     2423#line 2424 "configure"
     2424#include "confdefs.h"
     2425#include <sys/types.h>
     2426#include <sys/stat.h>
     2427
     2428#if defined(S_ISBLK) && defined(S_IFDIR)
     2429# if S_ISBLK (S_IFDIR)
     2430You lose.
     2431# endif
     2432#endif
     2433
     2434#if defined(S_ISBLK) && defined(S_IFCHR)
     2435# if S_ISBLK (S_IFCHR)
     2436You lose.
     2437# endif
     2438#endif
     2439
     2440#if defined(S_ISLNK) && defined(S_IFREG)
     2441# if S_ISLNK (S_IFREG)
     2442You lose.
     2443# endif
     2444#endif
     2445
     2446#if defined(S_ISSOCK) && defined(S_IFREG)
     2447# if S_ISSOCK (S_IFREG)
     2448You lose.
     2449# endif
     2450#endif
     2451
     2452EOF
     2453if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     2454  egrep "You lose" >/dev/null 2>&1; then
     2455  rm -rf conftest*
     2456  ac_cv_header_stat_broken=yes
     2457else
     2458  rm -rf conftest*
     2459  ac_cv_header_stat_broken=no
     2460fi
     2461rm -f conftest*
     2462
     2463fi
     2464
     2465echo "$ac_t""$ac_cv_header_stat_broken" 1>&6
     2466if test $ac_cv_header_stat_broken = yes; then
     2467  cat >> confdefs.h <<\EOF
     2468#define STAT_MACROS_BROKEN 1
     2469EOF
     2470
     2471fi
    24172472
    24182473for ac_hdr in limits.h unistd.h
     
    24202475ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    24212476echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2422 echo "configure:2423: checking for $ac_hdr" >&5
     2477echo "configure:2478: checking for $ac_hdr" >&5
    24232478if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    24242479  echo $ac_n "(cached) $ac_c" 1>&6
    24252480else
    24262481  cat > conftest.$ac_ext <<EOF
    2427 #line 2428 "configure"
     2482#line 2483 "configure"
    24282483#include "confdefs.h"
    24292484#include <$ac_hdr>
    24302485EOF
    24312486ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2432 { (eval echo configure:2433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2487{ (eval echo configure:2488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    24332488ac_err=`grep -v '^ *+' conftest.out`
    24342489if test -z "$ac_err"; then
     
    24582513
    24592514
    2460 for ac_hdr in sys/file.h sys/ioctl.h sys/time.h sys/times.h sys/types.h sys/stat.h fcntl.h
     2515for ac_hdr in sys/file.h sys/ioctl.h sys/time.h sys/times.h sys/types.h sys/stat.h fcntl.h sys/param.h pwd.h
    24612516do
    24622517ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    24632518echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2464 echo "configure:2465: checking for $ac_hdr" >&5
     2519echo "configure:2520: checking for $ac_hdr" >&5
    24652520if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    24662521  echo $ac_n "(cached) $ac_c" 1>&6
    24672522else
    24682523  cat > conftest.$ac_ext <<EOF
    2469 #line 2470 "configure"
     2524#line 2525 "configure"
    24702525#include "confdefs.h"
    24712526#include <$ac_hdr>
    24722527EOF
    24732528ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2474 { (eval echo configure:2475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2529{ (eval echo configure:2530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    24752530ac_err=`grep -v '^ *+' conftest.out`
    24762531if test -z "$ac_err"; then
     
    25012556WITH_DBM=no
    25022557echo $ac_n "checking whether to build with dbm links""... $ac_c" 1>&6
    2503 echo "configure:2504: checking whether to build with dbm links" >&5
     2558echo "configure:2559: checking whether to build with dbm links" >&5
    25042559if test "$with_dbm" != no; then
    25052560  cat >> confdefs.h <<\EOF
     
    25152570
    25162571echo $ac_n "checking for working const""... $ac_c" 1>&6
    2517 echo "configure:2518: checking for working const" >&5
     2572echo "configure:2573: checking for working const" >&5
    25182573if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    25192574  echo $ac_n "(cached) $ac_c" 1>&6
    25202575else
    25212576  cat > conftest.$ac_ext <<EOF
    2522 #line 2523 "configure"
     2577#line 2578 "configure"
    25232578#include "confdefs.h"
    25242579
     
    25692624; return 0; }
    25702625EOF
    2571 if { (eval echo configure:2572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2626if { (eval echo configure:2627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    25722627  rm -rf conftest*
    25732628  ac_cv_c_const=yes
     
    25902645
    25912646echo $ac_n "checking for inline""... $ac_c" 1>&6
    2592 echo "configure:2593: checking for inline" >&5
     2647echo "configure:2648: checking for inline" >&5
    25932648if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
    25942649  echo $ac_n "(cached) $ac_c" 1>&6
     
    25972652for ac_kw in inline __inline__ __inline; do
    25982653  cat > conftest.$ac_ext <<EOF
    2599 #line 2600 "configure"
     2654#line 2655 "configure"
    26002655#include "confdefs.h"
    26012656
     
    26042659; return 0; }
    26052660EOF
    2606 if { (eval echo configure:2607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2661if { (eval echo configure:2662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    26072662  rm -rf conftest*
    26082663  ac_cv_c_inline=$ac_kw; break
     
    26302685
    26312686echo $ac_n "checking for size_t""... $ac_c" 1>&6
    2632 echo "configure:2633: checking for size_t" >&5
     2687echo "configure:2688: checking for size_t" >&5
    26332688if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    26342689  echo $ac_n "(cached) $ac_c" 1>&6
    26352690else
    26362691  cat > conftest.$ac_ext <<EOF
    2637 #line 2638 "configure"
     2692#line 2693 "configure"
    26382693#include "confdefs.h"
    26392694#include <sys/types.h>
     
    26632718
    26642719echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
    2665 echo "configure:2666: checking whether time.h and sys/time.h may both be included" >&5
     2720echo "configure:2721: checking whether time.h and sys/time.h may both be included" >&5
    26662721if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    26672722  echo $ac_n "(cached) $ac_c" 1>&6
    26682723else
    26692724  cat > conftest.$ac_ext <<EOF
    2670 #line 2671 "configure"
     2725#line 2726 "configure"
    26712726#include "confdefs.h"
    26722727#include <sys/types.h>
     
    26772732; return 0; }
    26782733EOF
    2679 if { (eval echo configure:2680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2734if { (eval echo configure:2735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    26802735  rm -rf conftest*
    26812736  ac_cv_header_time=yes
     
    26982753
    26992754echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
    2700 echo "configure:2701: checking whether struct tm is in sys/time.h or time.h" >&5
     2755echo "configure:2756: checking whether struct tm is in sys/time.h or time.h" >&5
    27012756if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    27022757  echo $ac_n "(cached) $ac_c" 1>&6
    27032758else
    27042759  cat > conftest.$ac_ext <<EOF
    2705 #line 2706 "configure"
     2760#line 2761 "configure"
    27062761#include "confdefs.h"
    27072762#include <sys/types.h>
     
    27112766; return 0; }
    27122767EOF
    2713 if { (eval echo configure:2714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2768if { (eval echo configure:2769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    27142769  rm -rf conftest*
    27152770  ac_cv_struct_tm=time.h
     
    27352790# for constant arguments.  Useless!
    27362791echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
    2737 echo "configure:2738: checking for working alloca.h" >&5
     2792echo "configure:2793: checking for working alloca.h" >&5
    27382793if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    27392794  echo $ac_n "(cached) $ac_c" 1>&6
    27402795else
    27412796  cat > conftest.$ac_ext <<EOF
    2742 #line 2743 "configure"
     2797#line 2798 "configure"
    27432798#include "confdefs.h"
    27442799#include <alloca.h>
     
    27472802; return 0; }
    27482803EOF
    2749 if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     2804if { (eval echo configure:2805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    27502805  rm -rf conftest*
    27512806  ac_cv_header_alloca_h=yes
     
    27682823
    27692824echo $ac_n "checking for alloca""... $ac_c" 1>&6
    2770 echo "configure:2771: checking for alloca" >&5
     2825echo "configure:2826: checking for alloca" >&5
    27712826if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    27722827  echo $ac_n "(cached) $ac_c" 1>&6
    27732828else
    27742829  cat > conftest.$ac_ext <<EOF
    2775 #line 2776 "configure"
     2830#line 2831 "configure"
    27762831#include "confdefs.h"
    27772832
     
    27962851; return 0; }
    27972852EOF
    2798 if { (eval echo configure:2799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     2853if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    27992854  rm -rf conftest*
    28002855  ac_cv_func_alloca_works=yes
     
    28282883
    28292884echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
    2830 echo "configure:2831: checking whether alloca needs Cray hooks" >&5
     2885echo "configure:2886: checking whether alloca needs Cray hooks" >&5
    28312886if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    28322887  echo $ac_n "(cached) $ac_c" 1>&6
    28332888else
    28342889  cat > conftest.$ac_ext <<EOF
    2835 #line 2836 "configure"
     2890#line 2891 "configure"
    28362891#include "confdefs.h"
    28372892#if defined(CRAY) && ! defined(CRAY2)
     
    28582913for ac_func in _getb67 GETB67 getb67; do
    28592914  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2860 echo "configure:2861: checking for $ac_func" >&5
     2915echo "configure:2916: checking for $ac_func" >&5
    28612916if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    28622917  echo $ac_n "(cached) $ac_c" 1>&6
    28632918else
    28642919  cat > conftest.$ac_ext <<EOF
    2865 #line 2866 "configure"
     2920#line 2921 "configure"
    28662921#include "confdefs.h"
    28672922/* System header to define __stub macros and hopefully few prototypes,
     
    28862941; return 0; }
    28872942EOF
    2888 if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     2943if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    28892944  rm -rf conftest*
    28902945  eval "ac_cv_func_$ac_func=yes"
     
    29132968
    29142969echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
    2915 echo "configure:2916: checking stack direction for C alloca" >&5
     2970echo "configure:2971: checking stack direction for C alloca" >&5
    29162971if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    29172972  echo $ac_n "(cached) $ac_c" 1>&6
     
    29212976else
    29222977  cat > conftest.$ac_ext <<EOF
    2923 #line 2924 "configure"
     2978#line 2979 "configure"
    29242979#include "confdefs.h"
    29252980find_stack_direction ()
     
    29402995}
    29412996EOF
    2942 if { (eval echo configure:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     2997if { (eval echo configure:2998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    29432998then
    29442999  ac_cv_c_stack_direction=1
     
    29633018if test $ac_cv_prog_gcc = yes; then
    29643019    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
    2965 echo "configure:2966: checking whether ${CC-cc} needs -traditional" >&5
     3020echo "configure:3021: checking whether ${CC-cc} needs -traditional" >&5
    29663021if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    29673022  echo $ac_n "(cached) $ac_c" 1>&6
     
    29693024    ac_pattern="Autoconf.*'x'"
    29703025  cat > conftest.$ac_ext <<EOF
    2971 #line 2972 "configure"
     3026#line 3027 "configure"
    29723027#include "confdefs.h"
    29733028#include <sgtty.h>
     
    29873042  if test $ac_cv_prog_gcc_traditional = no; then
    29883043    cat > conftest.$ac_ext <<EOF
    2989 #line 2990 "configure"
     3044#line 3045 "configure"
    29903045#include "confdefs.h"
    29913046#include <termio.h>
     
    30123067ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    30133068echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    3014 echo "configure:3015: checking for $ac_hdr" >&5
     3069echo "configure:3070: checking for $ac_hdr" >&5
    30153070if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    30163071  echo $ac_n "(cached) $ac_c" 1>&6
    30173072else
    30183073  cat > conftest.$ac_ext <<EOF
    3019 #line 3020 "configure"
     3074#line 3075 "configure"
    30203075#include "confdefs.h"
    30213076#include <$ac_hdr>
    30223077EOF
    30233078ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    3024 { (eval echo configure:3025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     3079{ (eval echo configure:3080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    30253080ac_err=`grep -v '^ *+' conftest.out`
    30263081if test -z "$ac_err"; then
     
    30513106do
    30523107echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    3053 echo "configure:3054: checking for $ac_func" >&5
     3108echo "configure:3109: checking for $ac_func" >&5
    30543109if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    30553110  echo $ac_n "(cached) $ac_c" 1>&6
    30563111else
    30573112  cat > conftest.$ac_ext <<EOF
    3058 #line 3059 "configure"
     3113#line 3114 "configure"
    30593114#include "confdefs.h"
    30603115/* System header to define __stub macros and hopefully few prototypes,
     
    30793134; return 0; }
    30803135EOF
    3081 if { (eval echo configure:3082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     3136if { (eval echo configure:3137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    30823137  rm -rf conftest*
    30833138  eval "ac_cv_func_$ac_func=yes"
     
    31043159
    31053160echo $ac_n "checking for working mmap""... $ac_c" 1>&6
    3106 echo "configure:3107: checking for working mmap" >&5
     3161echo "configure:3162: checking for working mmap" >&5
    31073162if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
    31083163  echo $ac_n "(cached) $ac_c" 1>&6
     
    31123167else
    31133168  cat > conftest.$ac_ext <<EOF
    3114 #line 3115 "configure"
     3169#line 3170 "configure"
    31153170#include "confdefs.h"
    31163171
     
    32523307
    32533308EOF
    3254 if { (eval echo configure:3255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     3309if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    32553310then
    32563311  ac_cv_func_mmap_fixed_mapped=yes
     
    32753330
    32763331echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
    3277 echo "configure:3278: checking return type of signal handlers" >&5
     3332echo "configure:3333: checking return type of signal handlers" >&5
    32783333if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    32793334  echo $ac_n "(cached) $ac_c" 1>&6
    32803335else
    32813336  cat > conftest.$ac_ext <<EOF
    3282 #line 3283 "configure"
     3337#line 3338 "configure"
    32833338#include "confdefs.h"
    32843339#include <sys/types.h>
     
    32973352; return 0; }
    32983353EOF
    3299 if { (eval echo configure:3300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3354if { (eval echo configure:3355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    33003355  rm -rf conftest*
    33013356  ac_cv_type_signal=void
     
    33163371
    33173372echo $ac_n "checking for vprintf""... $ac_c" 1>&6
    3318 echo "configure:3319: checking for vprintf" >&5
     3373echo "configure:3374: checking for vprintf" >&5
    33193374if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    33203375  echo $ac_n "(cached) $ac_c" 1>&6
    33213376else
    33223377  cat > conftest.$ac_ext <<EOF
    3323 #line 3324 "configure"
     3378#line 3379 "configure"
    33243379#include "confdefs.h"
    33253380/* System header to define __stub macros and hopefully few prototypes,
     
    33443399; return 0; }
    33453400EOF
    3346 if { (eval echo configure:3347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     3401if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    33473402  rm -rf conftest*
    33483403  eval "ac_cv_func_vprintf=yes"
     
    33683423if test "$ac_cv_func_vprintf" != yes; then
    33693424echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
    3370 echo "configure:3371: checking for _doprnt" >&5
     3425echo "configure:3426: checking for _doprnt" >&5
    33713426if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    33723427  echo $ac_n "(cached) $ac_c" 1>&6
    33733428else
    33743429  cat > conftest.$ac_ext <<EOF
    3375 #line 3376 "configure"
     3430#line 3431 "configure"
    33763431#include "confdefs.h"
    33773432/* System header to define __stub macros and hopefully few prototypes,
     
    33963451; return 0; }
    33973452EOF
    3398 if { (eval echo configure:3399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     3453if { (eval echo configure:3454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    33993454  rm -rf conftest*
    34003455  eval "ac_cv_func__doprnt=yes"
     
    34203475fi
    34213476
    3422 for ac_func in gettimeofday strstr strtod strtol atexit bcopy
     3477for ac_func in gettimeofday strstr strtod strtol atexit bcopy getcwd getwd
    34233478do
    34243479echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    3425 echo "configure:3426: checking for $ac_func" >&5
     3480echo "configure:3481: checking for $ac_func" >&5
    34263481if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    34273482  echo $ac_n "(cached) $ac_c" 1>&6
    34283483else
    34293484  cat > conftest.$ac_ext <<EOF
    3430 #line 3431 "configure"
     3485#line 3486 "configure"
    34313486#include "confdefs.h"
    34323487/* System header to define __stub macros and hopefully few prototypes,
     
    34513506; return 0; }
    34523507EOF
    3453 if { (eval echo configure:3454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     3508if { (eval echo configure:3509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    34543509  rm -rf conftest*
    34553510  eval "ac_cv_func_$ac_func=yes"
     
    34783533
    34793534echo $ac_n "checking whether your machine has correct arithmetic shifts""... $ac_c" 1>&6
    3480 echo "configure:3481: checking whether your machine has correct arithmetic shifts" >&5
     3535echo "configure:3536: checking whether your machine has correct arithmetic shifts" >&5
    34813536if eval "test \"`echo '$''{'ac_cv_shift'+set}'`\" = set"; then
    34823537  echo $ac_n "(cached) $ac_c" 1>&6
     
    34913546else
    34923547  cat > conftest.$ac_ext <<EOF
    3493 #line 3494 "configure"
     3548#line 3549 "configure"
    34943549#include "confdefs.h"
    34953550 int main() { if (-2 >> 1 == -1) exit(0); else exit(1); }
    34963551EOF
    3497 if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     3552if { (eval echo configure:3553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    34983553then
    34993554  ac_cv_shift=yes
     
    35183573
    35193574echo $ac_n "checking whether vsprintf returns number of printed chars""... $ac_c" 1>&6
    3520 echo "configure:3521: checking whether vsprintf returns number of printed chars" >&5
     3575echo "configure:3576: checking whether vsprintf returns number of printed chars" >&5
    35213576if eval "test \"`echo '$''{'ac_cv_returns_n_of_chars'+set}'`\" = set"; then
    35223577  echo $ac_n "(cached) $ac_c" 1>&6
     
    35263581else
    35273582  cat > conftest.$ac_ext <<EOF
    3528 #line 3529 "configure"
     3583#line 3584 "configure"
    35293584#include "confdefs.h"
    35303585#include <stdio.h>
    35313586 main() { char *str=(char*)malloc(20); if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
    35323587EOF
    3533 if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     3588if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    35343589then
    35353590  ac_cv_returns_n_of_chars=yes
     
    35573612
    35583613echo $ac_n "checking size of char""... $ac_c" 1>&6
    3559 echo "configure:3560: checking size of char" >&5
     3614echo "configure:3615: checking size of char" >&5
    35603615if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
    35613616  echo $ac_n "(cached) $ac_c" 1>&6
     
    35653620else
    35663621  cat > conftest.$ac_ext <<EOF
    3567 #line 3568 "configure"
     3622#line 3623 "configure"
    35683623#include "confdefs.h"
    35693624#include <stdio.h>
     
    35763631}
    35773632EOF
    3578 if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     3633if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    35793634then
    35803635  ac_cv_sizeof_char=`cat conftestval`
     
    35963651
    35973652echo $ac_n "checking size of short""... $ac_c" 1>&6
    3598 echo "configure:3599: checking size of short" >&5
     3653echo "configure:3654: checking size of short" >&5
    35993654if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    36003655  echo $ac_n "(cached) $ac_c" 1>&6
     
    36043659else
    36053660  cat > conftest.$ac_ext <<EOF
    3606 #line 3607 "configure"
     3661#line 3662 "configure"
    36073662#include "confdefs.h"
    36083663#include <stdio.h>
     
    36153670}
    36163671EOF
    3617 if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     3672if { (eval echo configure:3673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    36183673then
    36193674  ac_cv_sizeof_short=`cat conftestval`
     
    36353690
    36363691echo $ac_n "checking size of int""... $ac_c" 1>&6
    3637 echo "configure:3638: checking size of int" >&5
     3692echo "configure:3693: checking size of int" >&5
    36383693if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    36393694  echo $ac_n "(cached) $ac_c" 1>&6
     
    36433698else
    36443699  cat > conftest.$ac_ext <<EOF
    3645 #line 3646 "configure"
     3700#line 3701 "configure"
    36463701#include "confdefs.h"
    36473702#include <stdio.h>
     
    36543709}
    36553710EOF
    3656 if { (eval echo configure:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     3711if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    36573712then
    36583713  ac_cv_sizeof_int=`cat conftestval`
     
    36743729
    36753730echo $ac_n "checking size of long""... $ac_c" 1>&6
    3676 echo "configure:3677: checking size of long" >&5
     3731echo "configure:3732: checking size of long" >&5
    36773732if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    36783733  echo $ac_n "(cached) $ac_c" 1>&6
     
    36823737else
    36833738  cat > conftest.$ac_ext <<EOF
    3684 #line 3685 "configure"
     3739#line 3740 "configure"
    36853740#include "confdefs.h"
    36863741#include <stdio.h>
     
    36933748}
    36943749EOF
    3695 if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     3750if { (eval echo configure:3751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    36963751then
    36973752  ac_cv_sizeof_long=`cat conftestval`
     
    37133768
    37143769echo $ac_n "checking size of void*""... $ac_c" 1>&6
    3715 echo "configure:3716: checking size of void*" >&5
     3770echo "configure:3771: checking size of void*" >&5
    37163771if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
    37173772  echo $ac_n "(cached) $ac_c" 1>&6
     
    37213776else
    37223777  cat > conftest.$ac_ext <<EOF
    3723 #line 3724 "configure"
     3778#line 3779 "configure"
    37243779#include "confdefs.h"
    37253780#include <stdio.h>
     
    37323787}
    37333788EOF
    3734 if { (eval echo configure:3735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     3789if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    37353790then
    37363791  ac_cv_sizeof_voidp=`cat conftestval`
     
    37523807
    37533808echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
    3754 echo "configure:3755: checking whether byte ordering is bigendian" >&5
     3809echo "configure:3810: checking whether byte ordering is bigendian" >&5
    37553810if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
    37563811  echo $ac_n "(cached) $ac_c" 1>&6
     
    37593814# See if sys/param.h defines the BYTE_ORDER macro.
    37603815cat > conftest.$ac_ext <<EOF
    3761 #line 3762 "configure"
     3816#line 3817 "configure"
    37623817#include "confdefs.h"
    37633818#include <sys/types.h>
     
    37703825; return 0; }
    37713826EOF
    3772 if { (eval echo configure:3773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3827if { (eval echo configure:3828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    37733828  rm -rf conftest*
    37743829  # It does; now see whether it defined to BIG_ENDIAN or not.
    37753830cat > conftest.$ac_ext <<EOF
    3776 #line 3777 "configure"
     3831#line 3832 "configure"
    37773832#include "confdefs.h"
    37783833#include <sys/types.h>
     
    37853840; return 0; }
    37863841EOF
    3787 if { (eval echo configure:3788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3842if { (eval echo configure:3843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    37883843  rm -rf conftest*
    37893844  ac_cv_c_bigendian=yes
     
    38053860else
    38063861  cat > conftest.$ac_ext <<EOF
    3807 #line 3808 "configure"
     3862#line 3863 "configure"
    38083863#include "confdefs.h"
    38093864main () {
     
    38183873}
    38193874EOF
    3820 if { (eval echo configure:3821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     3875if { (eval echo configure:3876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    38213876then
    38223877  ac_cv_c_bigendian=no
     
    38513906
    38523907echo $ac_n "checking which exponent types to use""... $ac_c" 1>&6
    3853 echo "configure:3854: checking which exponent types to use" >&5
     3908echo "configure:3909: checking which exponent types to use" >&5
    38543909if test "$with_exp_type" = "char"; then
    38553910  echo "$ac_t""char" 1>&6
     
    38853940
    38863941echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
    3887 echo "configure:3888: checking whether _AIX is defined" >&5
     3942echo "configure:3943: checking whether _AIX is defined" >&5
    38883943if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
    38893944  echo $ac_n "(cached) $ac_c" 1>&6
    38903945else
    38913946  cat > conftest.$ac_ext <<EOF
    3892 #line 3893 "configure"
     3947#line 3948 "configure"
    38933948#include "confdefs.h"
    38943949#ifdef _AIX
  • Singular/configure.in

    rd336d53 r1caa72  
    395395
    396396AC_HEADER_STDC
    397 
     397AC_HEADER_STAT
    398398AC_CHECK_HEADERS(limits.h unistd.h,,
    399399  AC_MSG_ERROR(Can not compile without limits.h unistd.h))
    400400
    401 AC_CHECK_HEADERS(sys/file.h sys/ioctl.h sys/time.h sys/times.h sys/types.h sys/stat.h fcntl.h)
     401AC_CHECK_HEADERS(sys/file.h sys/ioctl.h sys/time.h sys/times.h sys/types.h sys/stat.h fcntl.h sys/param.h pwd.h)
    402402
    403403dnl Check dbm
     
    430430AC_TYPE_SIGNAL
    431431AC_FUNC_VPRINTF
    432 AC_CHECK_FUNCS(gettimeofday strstr strtod strtol atexit bcopy)
     432AC_CHECK_FUNCS(gettimeofday strstr strtod strtol atexit bcopy getcwd getwd)
    433433
    434434dnl
  • Singular/extra.cc

    rd336d53 r1caa72  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.32 1998-04-03 17:38:35 Singular Exp $ */
     4/* $Id: extra.cc,v 1.33 1998-04-06 17:59:27 obachman Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
     
    245245    #endif
    246246    #endif
     247#if 0
     248/*==================== whoami ==================================*/
     249    if (strcmp((char*)(h->data), "whoami") == 0)
     250    {
     251      res->rtype=STRING_CMD;
     252    }
     253#endif
    247254/*==================== HC ==================================*/
    248255    if (strcmp((char*)(h->data),"HC")==0)
  • Singular/febase.cc

    rd336d53 r1caa72  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: febase.cc,v 1.26 1998-03-31 07:41:21 Singular Exp $ */
     4/* $Id: febase.cc,v 1.27 1998-04-06 17:59:27 obachman Exp $ */
    55/*
    66* ABSTRACT: i/o system
     
    103103#endif  /* macintosh */
    104104
     105extern "C" char* find_executable_path(const char* argv0);
     106
     107#define SINGULAR_RELATIVE_DATA_DIR "LIB"
     108
     109static char* SearchPath = NULL;
     110
     111// Return the file search path for singular w.r.t. the following priorities:
     112// Env-variables + Relative Data Dir + Burned-in data dir
     113char* feGetSearchPath(const char* argv0)
     114{   
     115  if (SearchPath == NULL)
     116  {
     117    char *env = NULL, *sibbling = NULL, *path;
     118    int plength = 0, tmp;
     119 
     120#ifdef MSDOS
     121    env=getenv("SPATH");
     122#else
     123    env=getenv("SINGULARPATH");
     124#endif
     125 
     126    if (argv0 != NULL)
     127      sibbling = find_executable_path(argv0);
     128 
     129    if (env != NULL)
     130      plength = strlen(env) + 1;
     131
     132    if (sibbling != NULL)
     133      plength += strlen(sibbling) + strlen(SINGULAR_RELATIVE_DATA_DIR) + 2;
     134 
     135    plength += strlen(SINGULAR_DATADIR) + 2;
     136 
     137    path = (char*) AllocL(plength*sizeof(char));
     138    SearchPath = path;
     139 
     140    if (env != NULL)
     141    {
     142      tmp = strlen(env);
     143      memcpy(path, env, tmp);
     144      path = &(path[tmp]);
     145      *path = FS_SEP;
     146      path++;
     147    }
     148 
     149    if (sibbling != NULL)
     150    {
     151      tmp = strlen(sibbling);
     152      memcpy(path, sibbling, tmp);
     153      path = &(path[tmp]);
     154      *path = DIR_SEP;
     155      path++;
     156      tmp = strlen(SINGULAR_RELATIVE_DATA_DIR);
     157      memcpy(path, SINGULAR_RELATIVE_DATA_DIR, tmp);
     158      path = &(path[tmp]);
     159      *path = FS_SEP;
     160      path++;
     161      FreeL(sibbling);
     162    }
     163 
     164    tmp = strlen(SINGULAR_DATADIR);
     165    memcpy(path,SINGULAR_DATADIR, tmp);
     166    path = &(path[tmp]);
     167    *path = '\0';
     168  }
     169  return SearchPath;
     170}
     171
     172
    105173FILE * feFopen(char *path, char *mode, char *where,int useWerror)
    106174{
     
    157225  {
    158226    char found = 0;
    159     #ifdef MSDOS
    160       char *env=getenv("SPATH");
    161     #else
    162       char *env=getenv("SINGULARPATH");
    163     #endif
     227    char* spath = feGetSearchPath();
    164228    char *s;
    165     #ifndef macintosh
    166     // extend path by SINGULAR_DATADIR
    167     s = (char*) AllocL((env != NULL ? strlen(env) : 0)
    168                        +strlen(SINGULAR_DATADIR)+2);
    169     if (env != NULL)
    170     {
    171       strcpy(s, env);
    172       s[strlen(env)] = FS_SEP;
    173       s[strlen(env)+1] = '\0';
    174       strcat(s, SINGULAR_DATADIR);
    175     }
    176     else strcpy(s, SINGULAR_DATADIR);
    177     env = s;
    178     #endif
     229
    179230    if (where==NULL) s=(char *)AllocL(250);
    180231    else             s=where;
    181     if (env!=NULL)
     232
     233    if (spath!=NULL)
    182234    {
    183235      char *p,*q;
    184       p = env;
     236      p = spath;
    185237      while( (q=strchr(p, FS_SEP)) != NULL)
    186238      {
     
    216268      f=fopen(path,mode);
    217269    }
    218     #ifndef macintosh
    219     FreeL(env);
    220     #endif
    221270    if (where==NULL) FreeL((ADDRESS)s);
    222271  }
  • Singular/febase.h

    rd336d53 r1caa72  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: febase.h,v 1.9 1998-03-31 09:00:43 Singular Exp $ */
     6/* $Id: febase.h,v 1.10 1998-04-06 17:59:28 obachman Exp $ */
    77/*
    88* ABSTRACT
     
    6565};
    6666
     67char*   feGetSearchPath(const char* argv0 = NULL);
    6768FILE *  feFopen(char *path, char *mode, char *where=NULL, int useWerror=FALSE);
    6869void    fePause(void);
  • Singular/kstd1.cc

    rd336d53 r1caa72  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd1.cc,v 1.17 1998-03-23 22:50:58 obachman Exp $ */
     4/* $Id: kstd1.cc,v 1.18 1998-04-06 17:59:29 obachman Exp $ */
    55/*
    66* ABSTRACT:
     
    16421642  initMora(F,strat);
    16431643  strat->spSpolyLoop = spGetSpolyLoop(currRing,
    1644                                       MAX(strat->ak,pMaxComp(q)),
     1644                                      max(strat->ak,pMaxComp(q)),
    16451645                                      strat->syzComp, FALSE);
    16461646  strat->enterS = enterSMoraNF;
     
    17371737  /*- set T -*/
    17381738  strat->spSpolyLoop = spGetSpolyLoop(currRing,
    1739                                       MAX(strat->ak,idRankFreeModule(q)),
     1739                                      max(strat->ak,idRankFreeModule(q)),
    17401740                                      strat->syzComp, FALSE);
    17411741  strat->tl = -1;
     
    18361836  else                 strat->LazyPass=20;
    18371837  strat->LazyDegree = 1;
     1838  strat->ak = idRankFreeModule(F);
    18381839  if ((h==testHomog)
    18391840#ifdef DRING
     
    18421843  )
    18431844  {
    1844     strat->ak = idRankFreeModule(F);
    18451845    if (strat->ak == 0)       
    18461846    {
     
    18761876  strat->homog=h;
    18771877  spSet(currRing);
    1878   strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
     1878  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat, syzComp);
    18791879  if (pOrdSgn==-1)
    18801880  {
     
    19421942  strat->LazyPass=32000;
    19431943  strat->LazyDegree = 10;
     1944  strat->ak = idRankFreeModule(F);
    19441945//   if(stdTrace!=NULL)
    19451946//     stdTrace->GetPrimes(F,primes);  // Array mit Primzahlen muß geordnet sein !
     
    19511952  )
    19521953  {
    1953     strat->ak = idRankFreeModule(F);
    19541954    if (strat->ak == 0)
    19551955    {
     
    19781978  strat->homog=h;
    19791979  spSet(currRing);
    1980   strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
     1980  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat syzComp);
    19811981//   if (pOrdSgn==-1)
    19821982//   {
     
    20352035  strat->LazyDegree = 1;
    20362036  strat->minim=(reduced % 2)+1;
     2037  strat->ak = idRankFreeModule(F);
    20372038  if ((h==testHomog)
    20382039#ifdef DRING
     
    20412042  )
    20422043  {
    2043     strat->ak = idRankFreeModule(F);
    20442044    if (strat->ak == 0)
    20452045    {
     
    20802080  strat->homog=h;
    20812081  spSet(currRing);
    2082   strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
     2082  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat, syzComp);
    20832083  if (pOrdSgn==-1)
    20842084  {
  • Singular/kstd2.cc

    rd336d53 r1caa72  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd2.cc,v 1.14 1998-03-23 22:50:59 obachman Exp $ */
     4/* $Id: kstd2.cc,v 1.15 1998-04-06 17:59:30 obachman Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: alg. of Buchberger
     
    15451545  /*- set S -*/
    15461546  strat->sl = -1;
    1547   strat->spSpolyLoop = spGetSpolyLoop(currRing, MAX(strat->ak, pMaxComp(q)),
     1547  strat->spSpolyLoop = spGetSpolyLoop(currRing, max(strat->ak, pMaxComp(q)),
    15481548                                      strat->syzComp, FALSE);
    15491549  /*- init local data struct.---------------------------------------- -*/
     
    15901590  strat->sl = -1;
    15911591  strat->spSpolyLoop =  spGetSpolyLoop(currRing,
    1592                                        MAX(strat->ak, idRankFreeModule(q)),
     1592                                       max(strat->ak, idRankFreeModule(q)),
    15931593                                       strat->syzComp, FALSE);
    15941594  /*- init local data struct.---------------------------------------- -*/
     
    16571657  else                 strat->LazyPass=20;
    16581658  strat->LazyDegree = 1;
     1659  strat->ak = idRankFreeModule(F);
    16591660  if ((h==testHomog))
    16601661  {
    1661     strat->ak = idRankFreeModule(F);
    16621662    if (strat->ak==0)
    16631663    {
  • Singular/kstdfac.cc

    rd336d53 r1caa72  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstdfac.cc,v 1.13 1998-03-23 14:07:54 obachman Exp $ */
     4/* $Id: kstdfac.cc,v 1.14 1998-04-06 17:59:31 obachman Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: factorizing alg. of Buchberger
     
    726726  else                 strat->LazyPass=20;
    727727  strat->LazyDegree = 1;
     728  strat->ak = idRankFreeModule(F);
    728729  if ((h==testHomog))
    729730  {
    730     strat->ak = idRankFreeModule(F);
    731731    if (strat->ak==0)
    732732    {
  • Singular/kutil.cc

    rd336d53 r1caa72  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.14 1998-03-23 22:51:00 obachman Exp $ */
     4/* $Id: kutil.cc,v 1.15 1998-04-06 17:59:32 obachman Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for std
     
    35753575{
    35763576  strat->interpt = BTEST1(OPT_INTERRUPT);
    3577   strat->ak = idRankFreeModule(F);
    35783577  strat->kHEdge=NULL;
    35793578  if (pOrdSgn==1) strat->kHEdgeFound=FALSE;
  • Singular/kutil.h

    rd336d53 r1caa72  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: kutil.h,v 1.6 1998-03-19 16:05:48 obachman Exp $ */
     6/* $Id: kutil.h,v 1.7 1998-04-06 17:59:33 obachman Exp $ */
    77/*
    88* ABSTRACT: kernel: utils for std
     
    175175
    176176rOrderType_t spGetOrderType(ring r, int modrank, int syzcomp);
    177 inline rOrderType_t spGetOrderType(ring r, kStrategy strat)
    178 {
    179   return spGetOrderType(r, strat->ak, strat->syzComp);
    180 }
    181 
    182 inline int MAX(int a, int b)
    183 {
    184   if (a > b) return a;
    185   else return b;
    186 }
    187 
    188177
    189178inline TSet initT () { return (TSet)Alloc0(setmax*sizeof(TObject)); }
  • Singular/misc.cc

    rd336d53 r1caa72  
    726726#endif
    727727              StringAppend("random=%d\n",siRandomStart);
    728 #ifdef MSDOS
    729               char *p=getenv("SPATH");
    730 #else
    731               char *p=getenv("SINGULARPATH");
    732 #endif
    733               if (p!=NULL)
    734                 return StringAppend("search path:%s:%s",p,SINGULAR_DATADIR);
    735               else
    736                 return StringAppend("search path:%s", SINGULAR_DATADIR);
    737 }
     728              return StringAppend("search path %s", feGetSearchPath());
     729}
  • Singular/mod2.h.in

    rd336d53 r1caa72  
    3636/* Define if you have sys/file.h */
    3737#undef HAVE_SYS_FILE_H
     38/* Define if you have sys/param.h */
     39#undef HAVE_SYS_PARAM_H
     40/* Define if you have sys/file.h */
     41#undef HAVE_SYS_TYPES_H
    3842/* Define if you have sys/ioctl.h */
    3943#undef HAVE_SYS_IOCTL_H
     
    4650/* Define if you have alloca.h */
    4751#undef HAVE_ALLOCA_H
     52/* Define if you have pwd.h */
     53#undef HAVE_PWD_H
    4854/* Define if you have alloca */
    4955#undef HAVE_ALLOCA
     
    6773/* Define if sprintf does not return number of printed chars */
    6874#undef BSD_SPRINTF
     75/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
     76#undef STAT_MACROS_BROKEN
     77/* Define if you have the getcwd function.  */
     78#undef HAVE_GETCWD
     79/* Define if you have the getwd function.  */
     80#undef HAVE_GETWD
    6981/* Define sizeof(char) */
    7082#define SIZEOF_CHAR 1
  • Singular/spSpolyLoop.h

    rd336d53 r1caa72  
    2525inline spSpolyLoopProc spGetSpolyLoop(ring r, kStrategy strat)
    2626{
    27   return spGetSpolyLoop(r, spGetOrderType(r, strat),
     27  return spGetSpolyLoop(r, spGetOrderType(r, strat->ak, strat->syzComp),
    2828                        ((strat->homog && strat->kModW==NULL &&
    2929                          ! rHasSimpleLexOrder(r))));
    3030}
     31
     32inline spSpolyLoopProc spGetSpolyLoop(ring r, kStrategy strat, int syzComp)
     33{
     34  return spGetSpolyLoop(r, spGetOrderType(r, strat->ak, syzComp),
     35                        ((strat->homog && strat->kModW==NULL &&
     36                          ! rHasSimpleLexOrder(r))));
     37}
     38
    3139
    3240inline spSpolyLoopProc spGetSpolyLoop(ring r)
  • Singular/spSpolyLoop.inc

    rd336d53 r1caa72  
    15251525    {
    15261526      assume(pComp0(b, a2) == 1);
     1527      assume(pComp0(b,a2) == 1);
    15271528      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
    15281529      a = pNext(a) = b;       // append b to result and advance a1
  • Singular/spSpolyLoop.pl

    rd336d53 r1caa72  
    11#!/usr/local/bin/perl
    22###########################################################################
    3 # $Id: spSpolyLoop.pl,v 1.5 1998-03-31 12:20:23 obachman Exp $
     3# $Id: spSpolyLoop.pl,v 1.6 1998-04-06 17:59:36 obachman Exp $
    44
    55###########################################################################
     
    1111##
    1212
     13###########################################################################
     14##
     15## How to add/modify generation of spSpolyLoops
     16##
     17
     18# 1.) Add property/characterisitc to property specification and make
     19# sure that property is checked for in spGetSpolyLoop(...) in
     20# spSpolyLoop.cc
     21#
     22# 2.) Modify macros of spSpolyLoops so that approriate actions are taken
     23# for new properties
     24#
     25# 3.) Add properties to check for in @input
    1326
    1427
     
    639652}
    640653
    641 
    642654###########################################################################
    643655##
     
    651663
    652664
     665###########################################################################
     666##
     667## Main program
     668##
     669
    653670#flatten out input
    654671@finput = &FlattenInput(@input);
     
    670687print $getspolyloop;
    671688
    672 
    673 
    674 
    675  
    676 
    677 
    678 
    679 
    680 
    681 
    682 
    683 
  • Singular/tesths.cc

    rd336d53 r1caa72  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: tesths.cc,v 1.31 1998-02-27 16:28:01 Singular Exp $ */
     4/* $Id: tesths.cc,v 1.32 1998-04-06 17:59:37 obachman Exp $ */
    55
    66/*
     
    5858  thisfile = argv[0];
    5959  BOOLEAN load_std_lib=TRUE;
     60  feGetSearchPath(thisfile);
     61 
    6062  /*. process parameters */
    6163  for (;(argc > 1) && (!feBatch); --argc, ++argv)
Note: See TracChangeset for help on using the changeset viewer.