Changeset 52a01d in git

Timestamp:

Jan 28, 2015, 11:25:49 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

6bd53ba88f906b9abf68e6983aac4cf495d7631c

Parents:

d8f9c942ee4bfbe1e3f486950f095b373d881a281386125efea2b96cc1b1eb9c36caa5004c0f47f6

Message:

Merge pull request #689 from surface-smoothers/fix.libcddgmp.check

use g++ instead of gcc for libcddgmp check (for ubuntu)
was somehow lost...

Files:

• Singular/LIB/normal.lib (modified) (6 diffs)
• Singular/dyn_modules/polymake/Makefile.am (modified) (2 diffs)
• doc/NEWS.texi (modified) (1 diff)
• doc/general.doc (modified) (previous)
• m4/flags.m4 (modified) (1 diff)
• m4/gfanlib-check.m4 (modified) (1 diff)

Singular/LIB/normal.lib

@@ -2286 +2286 @@
    if(size(N) < nvars(R0))
    {
-     string newvar=string(N);
-     execute("ring R=("+charstr(R0)+"),("+newvar+"),dp;");
+     list newvar=N[1..ncols(N)];
+     list @rl0=ringlist(R0);
+     @rl0[2]=list(N[1..ncols(N)]);
+     @rl0[3]=list(list("dp",1:ncols(N)),list("C",0));
+     def R=ring(@rl0); kill @rl0;
+     setring R;
      ideal I =imap(R0,I);
-     if((ringlist(R0)[3][1][1]=="dp")&&(size(ringlist(R0)[3])==2))
+     list @rl0=ringlist(R0);
+     if((@rl0[3][1][1]=="dp")&&(size(@rl0[3])==2))
      {
        attrib(I,"isSB",1);
@@ -2297 +2302 @@
        I=std(I);
      }
+     kill @rl0;
    }
    else
@@ -2307 +2313 @@
    if(dim(I)==2)
    {
-      def newR=basering;
+     def newR=basering;
    }
    else
    {
-      short=0;
-      string smp = string(minpoly);
-      if(dim(I)==0)
-      {
-         execute("ring Rhelp=("+charstr(R0)+"),(@s,@t),dp;");
-      }
-      else
-      {
-         execute("ring Rhelp=("+charstr(R0)+"),(@s),dp;");
-      }
-      if (smp!="0")
-      { execute("minpoly = "+smp+";");}
-      def newR=R+Rhelp;
-      setring newR;
-      ideal I=imap(R,I);
-      I=homog(I,@s);
-      attrib(I,"isSB",1);
+     list @rl0=ringlist(R0);
+     if(dim(I)==0)
+     {
+       @rl0[2]=list("@s","@t");
+       @rl0[3]=list(list("dp",1:2),list("C",0));
+     }
+     else
+     {
+       @rl0[2]=list("@s");
+       @rl0[3]=list(list("dp",1),list("C",0));
+     }
+     def Rhelp=ring(@rl0);
+     kill @rl0;
+     def newR=R+Rhelp;
+     setring newR;
+     ideal I=imap(R,I);
+     I=homog(I,@s);
+     attrib(I,"isSB",1);
    }
 
    if((nvars(basering)<=3)&&(size(I)>1))
    {
-       ERROR("This is not equidimensional");
+     ERROR("This is not equidimensional");
    }
 
@@ -2652 +2659 @@
    option(redSB);
    def R=basering;
-   execute("ring S=("+charstr(R)+"),(x,y),lp;");
+   list @rl=ringlist(R);
+   @rl[2]=list("x","y");
+   @rl[3]=list(list("lp",1:2),list("C",0));
+   def S=ring(@rl); setring S;
    map phi=R,x,y;
    ideal singL=phi(singL);
@@ -2665 +2675 @@
       map alpha=S,var(1)-singL[2][2],var(2)-singL[1][2];
       f=alpha(f);
-      execute("ring C=("+charstr(S)+"),("+varstr(S)+"),ds;");
+      def C=changeordTo(S,"ds"); setring C;
       poly f=imap(S,f);
       ideal singL=imap(S,singL);
@@ -2712 +2722 @@
       poly p=beta(p);
 
-      execute("ring C=("+charstr(S)+",a),("+varstr(S)+"),ds;");
+      execute("ring C=("+charstr(S)+",a),(x,y),ds;");
       number p=number(imap(B,p));
 

Singular/dyn_modules/polymake/Makefile.am

@@ -6 +6 @@
 ${FACTORY_INCLUDES} ${RESOURCES_INCLUDES} ${OMALLOC_INCLUDES} \
 ${FLINT_CFLAGS} ${NTL_CFLAGS} ${GMP_CFLAGS}
-# $(FEXCEPTIONS_FRTTI_CXXFLAGS) ??
+# $(FEXCEPTIONSFRTTI_CXXFLAGS) ??
 
 if SI_BUILTIN_POLYMAKE
@@ -23 +23 @@
 if SING_HAVE_POLYMAKE
 # forcefully enable exceptions for polymake
- CXXFLAGS+= $(FEXCEPTIONS_FRTTI_CXXFLAGS)
- PM_CXXFLAGS= ${FEXCEPTIONS_FRTTI_CXXFLAGS}
+ CXXFLAGS+= $(FEXCEPTIONSFRTTI_CXXFLAGS)
+ PM_CXXFLAGS= ${FEXCEPTIONSFRTTI_CXXFLAGS}
  P_PROCS_MODULE_LDFLAGS+= ${PM_LDFLAGS}
  polymake_la_LIBADD= ${PM_LIBS}

doc/NEWS.texi

@@ -26 +26 @@
 @item brillnoether.lib (@nref{brillnoether_lib})
 @item hess.lib (@nref{hess_lib})
+@end itemize
+
+Changed libraries:
+@itemize
+@item findvars (@nref{findvars},@nref{variables})
+@item addvarsTo (@nref{addvarsTo})
+@item addNvarsTo (@nref{addNvarsTo})
+@item normaliz.lib (@nref{normaliz_lib})
 @end itemize
 

m4/flags.m4

@@ -98 +98 @@
  AC_LANG_PUSH([C++])
  AX_APPEND_COMPILE_FLAGS(${FLAGS}, [CXXFLAGS])
- AX_APPEND_COMPILE_FLAGS([-fexceptions -frtti], [FEXCEPTIONS_FRTTI_CXXFLAGS])
+
+ # separate parts of Singular have to be real C++ :)
+ FFLAGS="-fexceptions -frtti"
+ AX_APPEND_COMPILE_FLAGS(${FFLAGS}, [FEXCEPTIONSFRTTI_CXXFLAGS])
+ AC_SUBST(FEXCEPTIONSFRTTI_CXXFLAGS)
+ 
  AC_LANG_POP([C++])
 
  AX_APPEND_LINK_FLAGS(${FLAGS})
-
- AC_SUBST(POLYMAKE_CXXFLAGS)
 
  if test "x${ENABLE_DEBUG}" = xyes; then

m4/gfanlib-check.m4

@@ -26 +26 @@
  LIBS="$LIBS -lcddgmp $GMP_LIBS "
 
- AC_LANG_PUSH(C)
+ AC_LANG_PUSH(C++)
  AC_LINK_IFELSE(
   [