Changeset e390b4 in git

Timestamp:

Mar 12, 2021, 5:28:43 PM (3 years ago)

Author:

Matthias Koeppe <mkoeppe@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4a211164c60ad151c9b211c9fa476d7b8427cb47

Parents:

f02e60e3100453b217440c433419b391ae87acb214fb1bda29b68a3a94beabc02612639b98e12fbd

Message:

Merge remote-tracking branch 'singular/spielwiese' into configure_doc

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• Singular/LIB/algebra.lib (modified) (5 diffs)
• Singular/dyn_modules/gfanlib/Makefile.am (modified) (1 diff)
• Singular/iparith.cc (modified) (1 diff)
• Tst/Short/liftstd_m.res.gz.uu (modified) (1 diff)
• Tst/Short/liftstd_m.stat (modified) (1 diff)
• Tst/Short/liftstd_m.tst (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• doc/.gitignore (added)
• doc/Makefile-docbuild.in (moved) (moved from doc/Makefile.bsp) (2 diffs)
• doc/Makefile.am (added)
• doc/help.cnf (added)
• doc/packages (deleted)
• doc/singular.doc (modified) (previous)
• doc/singular.idx (deleted)
• doc/version.texi.in (modified) (1 diff)
• gfanlib/Makefile.am (modified) (2 diffs)
• libpolys/coeffs/ffields.cc (modified) (3 diffs)
• libpolys/coeffs/numbers.cc (modified) (1 diff)

.gitignore

@@ -79 +79 @@
 /Singular/feOptGen
 /Singular/gftables
+/Singular/libparse
 /Singular/mpsr_Tok.xx
 /Singular/ndbm.dl_og

Makefile.am

@@ -5 +5 @@
 kernel Singular \
 dox emacs redhat desktop
+
+DIST_SUBDIRS = $(SUBDIRS) doc
 
 EXTRA_DIST = README README.md README.pkg autogen.sh doxy redhat/singular.spec.in GPL2 GPL3
@@ -25 +27 @@
 DISTCLEANFILES = $(nodist_configheader_HEADERS)
 
-dist_man1_MANS = doc/Singular.man doc/ESingular.man doc/TSingular.man
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = Singular.pc

Singular/LIB/algebra.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="version algebra.lib 4.1.2.0 Feb_2019 "; // $Id$
+version="version algebra.lib 4.2.0.1 Mar_2021 "; // $Id$
 category="Commutative Algebra";
 info="
@@ -66 +66 @@
     int m = ncols(A);
     int i;
-    string mp=string(minpoly);
     //-----------------
     // neu CL 10/05:
     int is_qring;
-    if (size(ideal(br))>0) {
+    if (size(ideal(br))>0)
+    {
       is_qring=1;
       ideal IdQ = ideal(br);
@@ -85 +85 @@
      l3[size(l3)+1] = "y("+string(yy)+")";
     }
-    ring R = create_ring(ringlist(br)[1], l3, "(dp("+string(n)+"),dp("+string(m)+"))", "no_minpoly"); 
-    if (mp!="0")
-    { execute ("minpoly=number("+mp+");"); }
-    ideal vars=x(1..n);
-    map emb=br,vars;
-    ideal A=ideal(emb(A));
-    poly check=emb(p);
+    list RL=ringlist(br);
+    RL[2]=l3; //vars
+    RL[3]=list(list("dp",1:n),list("dp",1:m)); //ord
+    RL[4]=ideal(0); // reset qring
+    ring R=ring(RL);
+    ideal A=fetch(br,A);
+    poly check=fetch(br,p);
     for (i=1;i<=m;i=i+1)
-    { A[i]=A[i]-y(i);
+    {
+      A[i]=A[i]-y(i);
     }
     //-----------------
     // neu CL 10/05:
-    if (is_qring) { A = A,emb(IdQ); }
+    if (is_qring) { A = A,fetch(br,IdQ); }
     //-----------------
     A=std(A);
@@ -108 +109 @@
   // use i also to control the display
     i = (sum(leadexp(check),1..n)==0);
-  degBound = DEGB;
+    degBound = DEGB;
     if( #[1] == 0 )
     { dbprint(printlevel-voice+3,"// "+string(check));
@@ -115 +116 @@
     else
     { list l = i,R;
-      kill A,vars,emb;
+      kill A;
       export check;
       dbprint(printlevel-voice+3,"

Singular/dyn_modules/gfanlib/Makefile.am

@@ -41 +41 @@
 
 if HAVE_GFANLIB
+# Use objects from the libtool convenience library
  gfanlib_la_LIBADD   += ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
 endif

Singular/iparith.cc

@@ -7860 +7860 @@
       syz=&(hw->data.uideal);
       alg=syGetAlgorithm((char*)u4->Data(),currRing,(ideal)u->Data());
+      h11=(ideal)u5->Data();
     }
     else

Tst/Short/liftstd_m.res.gz.uu

@@ -1 +1 @@
 begin 644 liftstd_m.res.gz
-M'XL("%8S0F`"`VQI9G1S=&1?;2YR97,`G51-;YM`$+WS*T96#Z`N&W;`7[&,
-M1%6IBE3G4'R+HH@T3HJ$P3)K!?CUG<7.[JJ*39,+'L_7>_,&)EU_O[D%`!'#
-MSYMO,)*UY$7^.%HXZ2F",9#S(2]SZ7H+1_U"'$.1/Y/[Z6'+R\TKKV4F=448
-M@[8C#E=7;\GPFLL_D!4%_*ZVCWF9R;PJ:ZB>H=HI,RL@V[\<MIM2UKK#F)MN
-M$P[[O'R!7["$@+D-:UGGL6)GV$YCV&9RGS>0W.']77A/F0U3B93*.I,XH\3J
-MZ5!L(!'+H^4FGHG/31R7B:!..B:"6!614W".EE]H\+5QHFZ4&J<ED2")=C25
-M=$\JN9H-6[/4(TXM"QC0&.H)3L=:GT9A3>>WG>XRCD]=UE00,,%((,HGTQ?T
-MSV^9(Y0C8`T8[,E;54I5?M-];3OFJ,9(I4U+'BMY:I&>72(](L?H?XG//T,<
-M`\,%Q;]<$D$D$O3ZA@K?Z8%-!=J8/:*CP$R"M1^\O)\/#8N?VA)^9$MH;0EG
-M[RJ37M1F/J!-&-AL*!J8D##8(;Z+W:MU"3\,A_`C"V1\9L!AF,D0S/3\F'0[
-MTN/-J!1@@OJ=UU]X."1C=%[&R)(QPOZ`]H?S-.,U_%@J,Z5Q5\=Q887>M>%$
-<WA5Q\G23D/<W7%WI0^T*;_'%^0NK5O.>^04`````
+M'XL("`E*2F`"`VQI9G1S=&1?;2YR97,`G55-;Z,P$+WS*T;1'D!K*#;DJU&0
+M6*VTJK3I8<FMJBJZ<5M+!")P&N#7[Y@D-JM^B/1`<,9OGI_?>'"R_GES"P`T
+M@M\W/V`D*^EEXG&TL)+3#(L`@P\B%])V%I9Z0Q1!)IXPO'G8>CD_>)5,I<X(
+M(M#CT(.KJS,8#D*^0)IE\+?8/HH\E:+(*RB>H-BI89I!6C[OMSR7E688>X9M
+MXD$I\F?X`TOPB5V3AK0.R79&[32";2I+44-\Q^[O@GM$UD0!$4I:`YPAL-CL
+M,PXQ71Y'=NR8^;F99\N8(I.>HWZDDC!(/8_UXE0OOC9!IHD2$^Q91-&B'>Y*
+MVB>7;*V&K$GBH*:&^`1P&^H7K)8T+FZ%U*W;M)IE')U8UIC@$TK0(,3CT*7X
+MSVV(157`)S68M2?GK`2SW+K]WK3$4L0,4^L&(SWPM"=Z]IGH$09&0X7/OR*<
+M^48+HY\:>)$:QKZD)KC`1A;VI(^[]BAYAJWPRN&5EY5J"3T_,8>?33NL?.'X
+ME)R[YU9YDPZB@KR0(+:[C"L$WT":8_<5^VP#!:(.I9#J8&ON6<?]OXLQ1?MB
+MYIBF8/,>;&WB@6]D!F^JT?$D)Z8!-0C>KX$I@09^;+NQ.^C9'8S?U=8=D`OT
+M38;JZS5,,/O`EDL7GP]<//0'F!/B%RLY?OT*)2AFNGMU<</WRM&B0K.FJ^6%
+M0TH2]DH2'CN@NQA.SES#KZ4:)FC2ZF@2K)AS;91B=(5*'4V";:+N*'4+[2N;
+-.HMOUC^#^#F4V08`````
 `
 end

Tst/Short/liftstd_m.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1614951254:4201, 64 bit:4.2.0:x86_64-Linux:terra:85544
-1 >> tst_memory_1 :: 1614951254:4201, 64 bit:4.2.0:x86_64-Linux:terra:2150192
-1 >> tst_memory_2 :: 1614951254:4201, 64 bit:4.2.0:x86_64-Linux:terra:2191296
-1 >> tst_timer_1 :: 1614951254:4201, 64 bit:4.2.0:x86_64-Linux:terra:3
+1 >> tst_memory_0 :: 1615481353:4201, 64 bit:4.2.0:x86_64-Linux::85928
+1 >> tst_memory_1 :: 1615481353:4201, 64 bit:4.2.0:x86_64-Linux::2150192
+1 >> tst_memory_2 :: 1615481353:4201, 64 bit:4.2.0:x86_64-Linux::2191296
+1 >> tst_timer_1 :: 1615481353:4201, 64 bit:4.2.0:x86_64-Linux::4

Tst/Short/liftstd_m.tst

@@ -19 +19 @@
 print(T);
 
-print(liftstd(A1,T,A2));
-print(T);
-
 print(liftstd(module(A),T,S,"std"));
 print(T);
 print(S);
+
+// relative versions
+
+// the three-argument relative version is not implemented and would overwrite A2
+// print(liftstd(A1,T,A2));
+// print(T);
 
 print(liftstd(A1,T,S,A2));

configure.ac

@@ -1 +1 @@
 AC_INIT([singular], [4.2.0], [singular@mathematik.uni-kl.de])
+
+AC_SUBST([VERSION_DATE], 2021)
 AC_DEFINE([VERSION_DATE],["Dec 2020"],[release date])
 
@@ -326 +328 @@
 AC_CONFIG_FILES([desktop/Makefile desktop/Singular.desktop desktop/Singular-manual.desktop])
 
+AC_CHECK_PROGS([MAKEINFO], [makeinfo])
+AC_CHECK_PROGS([TEXI2PDF], [texi2pdf])
+AC_CHECK_PROGS([TEXINDEX], [texindex])
+AC_CHECK_PROGS([DVIPS], [dvips])
+
+dnl Check for executables used by library files.
+dnl Found by: git grep 'system("\(sh\|executable\)"'
+AS_VAR_SET([DOC2TEX_EXAMPLE_EXCLUSIONS], ["-exclude polymake "])
+AC_CHECK_PROGS([QEPCAD], [qepcad])
+AS_IF([test -z "$QEPCAD"], [
+  AS_VAR_APPEND([DOC2TEX_EXAMPLE_EXCLUSIONS], ["-exclude qepcad "])])
+AC_CHECK_PROGS([FOURTITWO_HILBERT], [hilbert 4ti2-hilbert])
+AC_CHECK_PROGS([FOURTITWO_MARKOV], [markov 4ti2-markov])
+AC_CHECK_PROGS([FOURTITWO_GRAVER], [graver 4ti2-graver])
+AC_CHECK_PROGS([BERTINI], [bertini])
+AS_IF([test -z "$BERTINI"], [
+  AS_VAR_APPEND([DOC2TEX_EXAMPLE_EXCLUSIONS], ["-exclude bertini "])])
+AC_CHECK_PROGS([DOT], [dot])
+AC_CHECK_PROGS([SURF], [surf])
+AC_CHECK_PROGS([GFAN_TROPICALBASIS], [gfan_tropicalbasis])  dnl and more gfan_tropical...
+AC_SUBST([DOC2TEX_EXAMPLE_EXCLUSIONS])
+
+AC_CONFIG_FILES([doc/Makefile])
+AC_CONFIG_FILES([doc/Makefile-docbuild])
+AC_CONFIG_FILES([doc/version.texi])
+AC_CONFIG_LINKS([doc/pyobject.doc:doc/pyobject.${enable_pyobject_module}.doc
+                 doc/cones.doc:doc/cones.no.doc])
+
 AC_OUTPUT

doc/Makefile-docbuild.in

@@ -11 +11 @@
 SINGUNAME       = spielwiese
 
-bindir          = @bindir@
+top_builddir    = @top_builddir@
+top_srcdir      = @top_srcdir@
+bindir          = ${top_builddir}/Singular
+EXEEXT          = @EXEEXT@
 
 ##
@@ -21 +24 @@
 PERL            = perl
 TEX             = tex
-MAKEINFO        = makeinfo --force
+MAKEINFO        = @MAKEINFO@ --force
 TEXI2PDF        = @TEXI2PDF@
 TEXINDEX        = @TEXINDEX@
 # use our local texi2html
 TEXI2HTML       = ./texi2html
-DVIPS           = dvips
+DVIPS           = @DVIPS@
 
 VERBOSE         = 1 # override this with make VERBOSE=2
 
 # d2t stuff
-SINGULAR        = /scratch/hannes/billbo-sw/Singular/Singular
-SINGULAR_LIB_DIR= ../Singular/LIB
-ifeq ($(SINGUNAME),"ix86-Win")
-LIBPARSE        = ${bindir}/libparse.exe
-else
-LIBPARSE        = ./libparse
-endif
+SINGULAR        = ${top_builddir}/Singular/Singular
+SINGULAR_LIB_DIR= ${top_srcdir}/Singular/LIB
+# from Singular/Makefile.am, extended by dynmodules stuff:
+TESTS_ENVIRONMENT = SINGULARPATH='${top_builddir}/Singular/LIB:${top_srcdir}/Singular/LIB:${top_builddir}/libpolys/polys/.libs:${top_builddir}/factory/gftables:'"$$(for d in ${top_builddir}/Singular/dyn_modules/*/.libs; do printf $$d:; done)" SINGULAR_ROOT_DIR='${top_builddir}' PATH="${top_builddir}/IntegerProgramming:$$PATH"
+LIBPARSE        = ${bindir}/libparse${EXEEXT}
 DOC_SUBDIR      = ./d2t_singular
 EX_SUBDIR       = ./examples
 CHKSUM_DB       = ${DOC_SUBDIR}/chksum
 # which tags to avoid:
-DOC2TEX_EXAMPLE_EXCLUSIONS = -exclude polymake
+DOC2TEX_EXAMPLE_EXCLUSIONS = @DOC2TEX_EXAMPLE_EXCLUSIONS@
+@ENABLE_PYOBJECT_MODULE_FALSE@ DOC2TEX_EXAMPLE_EXCLUSIONS += -exclude pyobject
 # which tags to avoid:
 TAG             = polymake
-DOC2TEX         = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
+DOC2TEX         = ${TESTS_ENVIRONMENT} ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
                   -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
                   -exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
 
-DOC2TEX_M        = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
+DOC2TEX_M        = ${TESTS_ENVIRONMENT} ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
                   -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
                   -exdir ${EX_SUBDIR}

doc/version.texi.in

@@ -1 +1 @@
 @c DO not edit this file.
 
-@set VERSION @SINGULAR_VERSION@
+@set VERSION @PACKAGE_VERSION@
 @set VERSION_DATE @VERSION_DATE@
-@set SHORT_VERSION @SINGULAR_SHORT_VERSION@
+@set SHORT_VERSION @VERSION@

gfanlib/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
+
 if HAVE_GFANLIB
-  lib_LTLIBRARIES=libgfan.la
+# We build libgfan as a libtool convenience library.
+# It is not installed; instead, its objects will be spliced into the
+# module Singular/dyn_modules/gfanlib
+noinst_LTLIBRARIES = libgfan.la
 endif
-
-libgfandir = $(libdir)
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DGMPRATIONAL
@@ -17 +19 @@
 SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
 libgfan_la_SOURCES = $(SOURCES)
-libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS) -release ${PACKAGE_VERSION}
+libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS)
 
-libgfan_includedir =$(includedir)/gfanlib
-libgfan_include_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h  gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h  gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h
+noinst_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h  gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h  gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h
 
 DISTCLEANFILES =  config.h
-
-moduledir = $(libexecdir)/singular/MOD

libpolys/coeffs/ffields.cc

@@ -858 +858 @@
 BOOLEAN nfInitChar(coeffs r,  void * parameter)
 {
+  // the variables:
+  assume( getCoeffType(r) == n_GF );
+
+  GFInfo* p = (GFInfo *)(parameter);
+  assume (p->GFChar > 0);
+  assume (p->GFDegree > 0);
+  if ((IsPrime(p->GFChar)==p->GFChar)&&(p->GFDegree==1)) /* for oscar-system/Singular.jl/issues/177 */
+  {
+    return npInitChar(r,(void*)(long)p->GFChar);
+  }
+  if(p->GFChar > (2<<15))
+  {
+#ifndef SING_NDEBUG
+    WarnS("illegal characteristic");
+#endif
+    return TRUE;
+  }
+
+  const double check= log ((double) (p->GFChar));
+
+  #define sixteenlog2 11.09035489
+  if( (p->GFDegree * check) > sixteenlog2 )
+  {
+#ifndef SING_NDEBUG
+    Warn("Sorry: illegal size: %u ^ %u", p->GFChar, p->GFDegree );
+#endif
+    return TRUE;
+  }
+
   r->is_field=TRUE;
   r->is_domain=TRUE;
@@ -915 +944 @@
 #endif
 
-  // the variables:
-  assume( getCoeffType(r) == n_GF );
-
-  GFInfo* p = (GFInfo *)(parameter);
-  assume (p->GFChar > 0);
-  assume (p->GFDegree > 0);
 
   const char * name = p->GFPar_name;
@@ -948 +971 @@
   r->has_simple_Inverse=TRUE;
 
-  if ((IsPrime(p->GFChar)==p->GFChar)&&(p->GFDegree==1)) /* for oscar-system/Singular.jl/issues/177 */
-  {
-    return npInitChar(r,(void*)(long)p->GFChar);
-  }
-  if(p->GFChar > (2<<15))
-  {
-#ifndef SING_NDEBUG
-    WarnS("illegal characteristic");
-#endif
-    return TRUE;
-  }
-
-  const double check= log ((double) (p->GFChar));
-
-  #define sixteenlog2 11.09035489
-  if( (p->GFDegree * check) > sixteenlog2 )
-  {
-#ifndef SING_NDEBUG
-    Warn("Sorry: illegal size: %u ^ %u", p->GFChar, p->GFDegree );
-#endif
-    return TRUE;
-  }
-
   int c = (int)pow ((double)p->GFChar, (double)p->GFDegree);
 

libpolys/coeffs/numbers.cc

@@ -143 +143 @@
 static number ndParameter(const int, const coeffs r)
 {
-  Werror("ndParameter: n_Parameter is not implemented/relevant for (coeff_type = %d)",getCoeffType(r));
-  return NULL;
+  return r->cfInit(1,r);
 }