Changeset e11614 in git

Timestamp:

Mar 10, 2021, 8:00:52 PM (3 years ago)

Author:

Matthias Koeppe <mkoeppe@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

081b792212e031bf0548c6607026c0100ee49bd6

Parents:

cb0364d75bce40ce8de602323894845b3695cbb5f7951d3b3bfea118917f4155803e30bac0dc2b16

Message:

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

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Singular/fglm.cc (modified) (4 diffs)
• Singular/fglm.h (modified) (2 diffs)
• Singular/iparith.cc (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• doc/.gitignore (added)
• doc/Makefile.in (modified) (1 diff)
• doc/version.texi.in (modified) (1 diff)
• kernel/ideals.cc (modified) (4 diffs)

.gitignore

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

Makefile.am

@@ -13 +13 @@
 install-data-local:
         if test -e $(srcdir)/doc/doc.tbz2; then\
-          (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -));\
+          (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
            mkdir $(DESTDIR)$(datadir)/info;\
            mkdir $(DESTDIR)$(datadir)/doc;\

Singular/fglm.cc

@@ -348 +348 @@
 }
 
+ideal fglmQuot( ideal first, poly second )
+{
+    FglmState state = FglmOk;
+
+    ideal sourceIdeal = first;
+    poly quot = second;
+    ideal destIdeal = NULL;
+
+    state = fglmIdealcheck( sourceIdeal );
+    if ( state == FglmOk )
+    {
+      if ( quot == NULL ) state= FglmPolyIsZero;
+      else if ( pIsConstant( quot ) ) state= FglmPolyIsOne;
+    }
+
+    if ( state == FglmOk )
+    {
+      if ( fglmquot( sourceIdeal, quot, destIdeal ) == FALSE )
+        state= FglmNotReduced;
+    }
+
+    switch (state)
+    {
+        case FglmOk:
+            break;
+        case FglmHasOne:
+            destIdeal= idInit(1,1);
+            (destIdeal->m)[0]= pOne();
+            state= FglmOk;
+            break;
+        case FglmNotZeroDim:
+            WerrorS( "The ideal has to be 0-dimensional" );
+            destIdeal= idInit(1,1);
+            break;
+        case FglmNotReduced:
+            WerrorS( "The poly has to be reduced" );
+            destIdeal= idInit(1,1);
+            break;
+        case FglmPolyIsOne:
+            int k;
+            destIdeal= idInit( IDELEMS(sourceIdeal), 1 );
+            for ( k= IDELEMS( sourceIdeal )-1; k >=0; k-- )
+              (destIdeal->m)[k]= pCopy( (sourceIdeal->m)[k] );
+            state= FglmOk;
+            break;
+        case FglmPolyIsZero:
+            destIdeal= idInit(1,1);
+            (destIdeal->m)[0]= pOne();
+            state= FglmOk;
+            break;
+        default:
+            destIdeal= idInit(1,1);
+    }
+
+    return destIdeal;
+}
+
 // fglmQuotProc: Calculate I:f with FGLM methods.
 // Checks the input-data, and calls fglmquot (see fglmzero.cc).
@@ -415 +472 @@
 } // fglmQuotProt
 
-// The main function for finduni().
-// Checks the input-data, and calls FindUnivariateWrapper (see fglmzero.cc).
-// Returns an ideal containing the univariate Polynomials or 0 if an error
-// has occoured.
-BOOLEAN
-findUniProc( leftv result, leftv first )
+ideal findUni( ideal first )
 {
     ideal sourceIdeal;
@@ -426 +478 @@
     FglmState state;
 
-    sourceIdeal = (ideal)first->Data();
-
-    assumeStdFlag( first );
+    sourceIdeal = first;
+
     state= fglmIdealcheck( sourceIdeal );
     if ( state == FglmOk )
@@ -470 +521 @@
             break;
         case FglmNotZeroDim:
+            WerrorS( "The ideal has to be 0-dimensional" );
+            destIdeal= idInit(1,1);
+            break;
+        case FglmNotReduced:
+            Werror( "The ideal has to be reduced" );
+            destIdeal= idInit(1,1);
+            break;
+        default:
+            destIdeal= idInit(1,1);
+    }
+
+    return destIdeal;
+}
+// The main function for finduni().
+// Checks the input-data, and calls FindUnivariateWrapper (see fglmzero.cc).
+// Returns an ideal containing the univariate Polynomials or 0 if an error
+// has occoured.
+BOOLEAN
+findUniProc( leftv result, leftv first )
+{
+    ideal sourceIdeal;
+    ideal destIdeal = NULL;
+    FglmState state;
+
+    sourceIdeal = (ideal)first->Data();
+
+    assumeStdFlag( first );
+    state= fglmIdealcheck( sourceIdeal );
+    if ( state == FglmOk )
+    {
+      // check for special cases: if the input contains
+      // univariate polys, try to reduce the problem
+      int i,k;
+      int count=0;
+      BOOLEAN * purePowers = (BOOLEAN *)omAlloc0( currRing->N*sizeof( BOOLEAN ) );
+      for ( k= IDELEMS( sourceIdeal ) - 1; k >= 0; k-- )
+      {
+        if((i=pIsUnivariate(sourceIdeal->m[k]))>0)
+        {
+          if (purePowers[i-1]==0)
+          {
+            purePowers[i-1]=k;
+            count++;
+            if (count==currRing->N) break;
+          }
+        }
+      }
+      if (count==currRing->N)
+      {
+        destIdeal=idInit(currRing->N,1);
+        for(k=currRing->N-1; k>=0; k--) destIdeal->m[k]=pCopy(sourceIdeal->m[purePowers[k]]);
+      }
+      omFreeSize((ADDRESS)purePowers, currRing->N*sizeof( BOOLEAN ) );
+      if (destIdeal!=NULL)
+            state = FglmOk;
+      else if ( FindUnivariateWrapper( sourceIdeal, destIdeal ) == FALSE )
+            state = FglmNotReduced;
+    }
+    switch (state)
+    {
+        case FglmOk:
+            break;
+        case FglmHasOne:
+            destIdeal= idInit(1,1);
+            (destIdeal->m)[0]= pOne();
+            state= FglmOk;
+            break;
+        case FglmNotZeroDim:
             Werror( "The ideal %s has to be 0-dimensional", first->Name() );
             destIdeal= NULL;

Singular/fglm.h

@@ -24 +24 @@
 //  Returns TRUE if an error occoured.
 BOOLEAN fglmQuotProc( leftv result, leftv first, leftv second );
+ideal fglmQuot( ideal first, poly second );
 
 // FindUnivariatePolys (test)
@@ -30 +31 @@
 // wrapper for FindUnivariatePolys (test)
 BOOLEAN findUniProc( leftv result, leftv first);
+ideal findUni( ideal first );
 
 // homogeneous FGLM

Singular/iparith.cc

@@ -3003 +3003 @@
   res->data = (char *)idQuot((ideal)u->Data(),(ideal)v->Data(),
     hasFlag(u,FLAG_STD),u->Typ()==v->Typ());
-  id_DelMultiples((ideal)(res->data),currRing);
   if (TEST_OPT_RETURN_SB) setFlag(res,FLAG_STD);
   return FALSE;

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])
+AC_CONFIG_FILES([doc/Makefile])
+AC_CONFIG_FILES([doc/version.texi])
+AC_CONFIG_LINKS([doc/pyobject.doc:doc/pyobject.${enable_pyobject_module}.doc
+                 doc/cones.doc:doc/cones.yes.doc])
+
 AC_OUTPUT

doc/Makefile.in

@@ -76 +76 @@
 # File sets
 #
-STANDALONE_TEXI_FILES   = COPYING.texi INSTALL_unix.texi NEWS.texi \
-                          README_download.texi README_ftp.texi \
-                          README_distribution.texi README_src.texi \
-                          INSTALL_win.texi
+STANDALONE_TEXI_FILES   = COPYING.texi NEWS.texi  lib2doc.texi
 
 DOC2TEX_FILES   = cones.tex countedref.tex decodegb.tex \

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@

kernel/ideals.cc

@@ -696 +696 @@
 }
 
-/*2
-* compute the syzygies of h1 in R/quot,
-* weights of components are in w
-* if setRegularity, return the regularity in deg
-* do not change h1,  w
-*/
-ideal idSyzygies (ideal  h1, tHomog h,intvec **w, BOOLEAN setSyzComp,
-                  BOOLEAN setRegularity, int *deg, GbVariant alg)
-{
-  ideal s_h1;
-  int   j, k, length=0,reg;
-  BOOLEAN isMonomial=TRUE;
-  int ii, idElemens_h1;
-
-  assume(h1 != NULL);
-
-  idElemens_h1=IDELEMS(h1);
-#ifdef PDEBUG
-  for(ii=0;ii<idElemens_h1 /*IDELEMS(h1)*/;ii++) pTest(h1->m[ii]);
-#endif
-  if (idIs0(h1))
-  {
-    ideal result=idFreeModule(idElemens_h1/*IDELEMS(h1)*/);
-    return result;
-  }
-  int slength=(int)id_RankFreeModule(h1,currRing);
-  k=si_max(1,slength /*id_RankFreeModule(h1)*/);
-
-  assume(currRing != NULL);
-  ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);
-  if (setSyzComp) rSetSyzComp(k,syz_ring);
-
-  if (orig_ring != syz_ring)
-  {
-    rChangeCurrRing(syz_ring);
-    s_h1=idrCopyR_NoSort(h1,orig_ring,syz_ring);
-  }
-  else
-  {
-    s_h1 = h1;
-  }
-
-  idTest(s_h1);
-
-  BITSET save_opt;
-  SI_SAVE_OPT1(save_opt);
-  si_opt_1|=Sy_bit(OPT_REDTAIL_SYZ);
-
-  ideal s_h3=idPrepare(s_h1,NULL,h,k,w,alg); // main (syz) GB computation
-
-  SI_RESTORE_OPT1(save_opt);
-
-  if (s_h3==NULL)
-  {
-    if (orig_ring != syz_ring)
-    {
-      rChangeCurrRing(orig_ring);
-      rDelete(syz_ring);
-    }
-    return idFreeModule( idElemens_h1 /*IDELEMS(h1)*/);
-  }
-
-  if (orig_ring != syz_ring)
-  {
-    idDelete(&s_h1);
-    for (j=0; j<IDELEMS(s_h3); j++)
-    {
-      if (s_h3->m[j] != NULL)
-      {
-        if (p_MinComp(s_h3->m[j],syz_ring) > k)
-          p_Shift(&s_h3->m[j], -k,syz_ring);
-        else
-          p_Delete(&s_h3->m[j],syz_ring);
-      }
-    }
-    idSkipZeroes(s_h3);
-    s_h3->rank -= k;
-    rChangeCurrRing(orig_ring);
-    s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
-    rDelete(syz_ring);
-    #ifdef HAVE_PLURAL
-    if (rIsPluralRing(orig_ring))
-    {
-      id_DelMultiples(s_h3,orig_ring);
-      idSkipZeroes(s_h3);
-    }
-    #endif
-    idTest(s_h3);
-    return s_h3;
-  }
-
-  ideal e = idInit(IDELEMS(s_h3), s_h3->rank);
-
-  for (j=IDELEMS(s_h3)-1; j>=0; j--)
-  {
-    if (s_h3->m[j] != NULL)
-    {
-      if (p_MinComp(s_h3->m[j],syz_ring) <= k)
-      {
-        e->m[j] = s_h3->m[j];
-        isMonomial=isMonomial && (pNext(s_h3->m[j])==NULL);
-        p_Delete(&pNext(s_h3->m[j]),syz_ring);
-        s_h3->m[j] = NULL;
-      }
-    }
-  }
-
-  idSkipZeroes(s_h3);
-  idSkipZeroes(e);
-
-  if ((deg != NULL)
-  && (!isMonomial)
-  && (!TEST_OPT_NOTREGULARITY)
-  && (setRegularity)
-  && (h==isHomog)
-  && (!rIsPluralRing(currRing))
-  && (!rField_is_Ring(currRing))
-  )
-  {
-    assume(orig_ring==syz_ring);
-    ring dp_C_ring = rAssure_dp_C(syz_ring); // will do rChangeCurrRing later
-    if (dp_C_ring != syz_ring)
-    {
-      rChangeCurrRing(dp_C_ring);
-      e = idrMoveR_NoSort(e, syz_ring, dp_C_ring);
-    }
-    resolvente res = sySchreyerResolvente(e,-1,&length,TRUE, TRUE);
-    intvec * dummy = syBetti(res,length,&reg, *w);
-    *deg = reg+2;
-    delete dummy;
-    for (j=0;j<length;j++)
-    {
-      if (res[j]!=NULL) idDelete(&(res[j]));
-    }
-    omFreeSize((ADDRESS)res,length*sizeof(ideal));
-    idDelete(&e);
-    if (dp_C_ring != orig_ring)
-    {
-      rChangeCurrRing(orig_ring);
-      rDelete(dp_C_ring);
-    }
-  }
-  else
-  {
-    idDelete(&e);
-  }
-  assume(orig_ring==currRing);
-  idTest(s_h3);
-  if (currRing->qideal != NULL)
-  {
-    ideal ts_h3=kStd(s_h3,currRing->qideal,h,w);
-    idDelete(&s_h3);
-    s_h3 = ts_h3;
-  }
-  return s_h3;
-}
-
 ideal idExtractG_T_S(ideal s_h3,matrix *T,ideal *S,long syzComp,
     int h1_size,BOOLEAN inputIsIdeal,const ring oring, const ring sring)
@@ -955 +797 @@
       (*S)->m[i] = prMoveR_NoSort((*S)->m[i], sring,oring);
     }
+  }
+  return s_h3;
+}
+
+/*2
+* compute the syzygies of h1 in R/quot,
+* weights of components are in w
+* if setRegularity, return the regularity in deg
+* do not change h1,  w
+*/
+ideal idSyzygies (ideal  h1, tHomog h,intvec **w, BOOLEAN setSyzComp,
+                  BOOLEAN setRegularity, int *deg, GbVariant alg)
+{
+  ideal s_h1;
+  int   j, k, length=0,reg;
+  BOOLEAN isMonomial=TRUE;
+  int ii, idElemens_h1;
+
+  assume(h1 != NULL);
+
+  idElemens_h1=IDELEMS(h1);
+#ifdef PDEBUG
+  for(ii=0;ii<idElemens_h1 /*IDELEMS(h1)*/;ii++) pTest(h1->m[ii]);
+#endif
+  if (idIs0(h1))
+  {
+    ideal result=idFreeModule(idElemens_h1/*IDELEMS(h1)*/);
+    return result;
+  }
+  int slength=(int)id_RankFreeModule(h1,currRing);
+  k=si_max(1,slength /*id_RankFreeModule(h1)*/);
+
+  assume(currRing != NULL);
+  ring orig_ring=currRing;
+  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);
+  if (setSyzComp) rSetSyzComp(k,syz_ring);
+
+  if (orig_ring != syz_ring)
+  {
+    rChangeCurrRing(syz_ring);
+    s_h1=idrCopyR_NoSort(h1,orig_ring,syz_ring);
+  }
+  else
+  {
+    s_h1 = h1;
+  }
+
+  idTest(s_h1);
+
+  BITSET save_opt;
+  SI_SAVE_OPT1(save_opt);
+  si_opt_1|=Sy_bit(OPT_REDTAIL_SYZ);
+
+  ideal s_h3=idPrepare(s_h1,NULL,h,k,w,alg); // main (syz) GB computation
+
+  SI_RESTORE_OPT1(save_opt);
+
+  if (orig_ring != syz_ring)
+  {
+    idDelete(&s_h1);
+    for (j=0; j<IDELEMS(s_h3); j++)
+    {
+      if (s_h3->m[j] != NULL)
+      {
+        if (p_MinComp(s_h3->m[j],syz_ring) > k)
+          p_Shift(&s_h3->m[j], -k,syz_ring);
+        else
+          p_Delete(&s_h3->m[j],syz_ring);
+      }
+    }
+    idSkipZeroes(s_h3);
+    s_h3->rank -= k;
+    rChangeCurrRing(orig_ring);
+    s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
+    rDelete(syz_ring);
+    #ifdef HAVE_PLURAL
+    if (rIsPluralRing(orig_ring))
+    {
+      id_DelMultiples(s_h3,orig_ring);
+      idSkipZeroes(s_h3);
+    }
+    #endif
+    idTest(s_h3);
+    return s_h3;
+  }
+
+  ideal e = idInit(IDELEMS(s_h3), s_h3->rank);
+
+  for (j=IDELEMS(s_h3)-1; j>=0; j--)
+  {
+    if (s_h3->m[j] != NULL)
+    {
+      if (p_MinComp(s_h3->m[j],syz_ring) <= k)
+      {
+        e->m[j] = s_h3->m[j];
+        isMonomial=isMonomial && (pNext(s_h3->m[j])==NULL);
+        p_Delete(&pNext(s_h3->m[j]),syz_ring);
+        s_h3->m[j] = NULL;
+      }
+    }
+  }
+
+  idSkipZeroes(s_h3);
+  idSkipZeroes(e);
+
+  if ((deg != NULL)
+  && (!isMonomial)
+  && (!TEST_OPT_NOTREGULARITY)
+  && (setRegularity)
+  && (h==isHomog)
+  && (!rIsPluralRing(currRing))
+  && (!rField_is_Ring(currRing))
+  )
+  {
+    assume(orig_ring==syz_ring);
+    ring dp_C_ring = rAssure_dp_C(syz_ring); // will do rChangeCurrRing later
+    if (dp_C_ring != syz_ring)
+    {
+      rChangeCurrRing(dp_C_ring);
+      e = idrMoveR_NoSort(e, syz_ring, dp_C_ring);
+    }
+    resolvente res = sySchreyerResolvente(e,-1,&length,TRUE, TRUE);
+    intvec * dummy = syBetti(res,length,&reg, *w);
+    *deg = reg+2;
+    delete dummy;
+    for (j=0;j<length;j++)
+    {
+      if (res[j]!=NULL) idDelete(&(res[j]));
+    }
+    omFreeSize((ADDRESS)res,length*sizeof(ideal));
+    idDelete(&e);
+    if (dp_C_ring != orig_ring)
+    {
+      rChangeCurrRing(orig_ring);
+      rDelete(dp_C_ring);
+    }
+  }
+  else
+  {
+    idDelete(&e);
+  }
+  assume(orig_ring==currRing);
+  idTest(s_h3);
+  if (currRing->qideal != NULL)
+  {
+    ideal ts_h3=kStd(s_h3,currRing->qideal,h,w);
+    idDelete(&s_h3);
+    s_h3 = ts_h3;
   }
   return s_h3;
@@ -2392 +2382 @@
   if (T!=NULL) idDelete((ideal*)T);
 
-  int i,rk,flength=0,slength,length;
+  int i,flength=0,slength,length;
   poly p,q;
 
@@ -2430 +2420 @@
     //Print("weights:");wtmp->show(1);PrintLn();
   }
-  rk = IDELEMS(h2);
   ideal s_temp1;
   ring orig_ring=currRing;