Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Dec 2020 18:17:32 +0000 (UTC)
From:      Mikael Urankar <mikael@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r556996 - in head/math/gfan: . files
Message-ID:  <202012041817.0B4IHWC4054596@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mikael
Date: Fri Dec  4 18:17:32 2020
New Revision: 556996
URL: https://svnweb.freebsd.org/changeset/ports/556996

Log:
  math/gfan: pass maintainership
  
  o Update URL in MASTER_SITES to current address
  o Update MAINTAINER
  o Remove post-patch target as it is not needed
  	- Use LDFLAGS instead of the non-standard variable
  	  ADDITIONALLINKOPTIONS.
  	- Replace "${REINPLACE_CMD} 's,log2,gfan_log2,g'" by appropriate
  	  patch files as the command triggers multiple warnings. log2 is
  	  a macro defined in src/log.h. The name of this macro is in
  	  conflict with the function log2 from math.h. To avoid errors
  	  when compiling the code, the above renaming is necessary.
  	  Furthermore, PHB 4.4.3 strongly suggests using patch files
  	  instead of REINPLACE_CMD for static content.
  o Sort pkg-plist alphabetically as required by PHB 3.2.2
  o Shorten pkg-descr and make it less technical
  
  PR:		250879
  Submitted by:	Moritz Schmitt (maintainer)

Added:
  head/math/gfan/files/patch-src_app__doesidealcontain.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_app__fiberpolytope.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_app__groebnerfan.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_app__main.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_app__resultantfan.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_app__secondaryfan.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_app__tropicalintersection.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_app__tropicaltraverse.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_bergman.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_breadthfirstsearch.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_buchberger.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_codimoneconnectedness.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_enumeration.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_ep__xfig.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_field__rationals.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_gfanlib__polyhedralfan.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_gfanlib__symmetriccomplex.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_gfanlib__zfan.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_halfopencone.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_linalg.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_log.h   (contents, props changed)
  head/math/gfan/files/patch-src_lp__soplexcdd.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_padic.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_polyhedralcone.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_polyhedralfan.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_reversesearch.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_singular.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_symmetriccomplex.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_symmetry.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_traverser__stableintersection.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_traverser__tropical.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_triangulation2.h   (contents, props changed)
  head/math/gfan/files/patch-src_tropical.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_tropical2.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_tropical__weildivisor.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_tropicalbasis.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_tropicalcurve.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_tropicaltraverse.cpp   (contents, props changed)
  head/math/gfan/files/patch-src_wallideal.cpp   (contents, props changed)
Deleted:
  head/math/gfan/pkg-message
Modified:
  head/math/gfan/Makefile
  head/math/gfan/pkg-descr
  head/math/gfan/pkg-plist

Modified: head/math/gfan/Makefile
==============================================================================
--- head/math/gfan/Makefile	Fri Dec  4 17:57:32 2020	(r556995)
+++ head/math/gfan/Makefile	Fri Dec  4 18:17:32 2020	(r556996)
@@ -2,12 +2,12 @@
 
 PORTNAME=	gfan
 DISTVERSION=	0.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	http://home.math.au.dk/jensen/software/gfan/
+MASTER_SITES=	https://users-math.au.dk/jensen/software/gfan/
 DISTNAME=	${PORTNAME}${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	moritz@schmi.tt
 COMMENT=	Software for computing Groebner fans and tropical varieties
 
 LICENSE=	GPLv2+
@@ -18,17 +18,10 @@ LIB_DEPENDS=	libcddgmp.so:math/cddlib \
 
 USES=		compiler:c++11-lang gmake localbase
 
-CFLAGS+=	-DGMPRATIONAL
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-post-patch:
-	@${REINPLACE_CMD} \
-		's,ADDITIONALLINKOPTIONS = ,ADDITIONALLINKOPTIONS = -L${LOCALBASE}/lib ,' \
-		${WRKSRC}/Makefile
-	for x in ${WRKSRC}/src/*; \
-		do ${REINPLACE_CMD} 's,log2,gfan_log2,g' $$x; \
-		done
+CFLAGS+=	-DGMPRATIONAL
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gfan ${STAGEDIR}${PREFIX}/bin
@@ -41,7 +34,7 @@ post-install-DOCS-on:
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	${CP} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 do-test:
 	cd ${WRKSRC} && ./gfan _test

Added: head/math/gfan/files/patch-src_app__doesidealcontain.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_app__doesidealcontain.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,15 @@
+--- src/app_doesidealcontain.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/app_doesidealcontain.cpp
+@@ -52,9 +52,9 @@ class DoesIdealContainApplication : public GFanApplica
+     	for(PolynomialSet::const_iterator i=b.begin();i!=b.end();i++)
+     	{
+     		Polynomial remainder=division(multiplier* *i,a,LexicographicTermOrder());
+-	log2 AsciiPrinter(Stderr).printString("Remainder: ");
+-	log2 AsciiPrinter(Stderr).printPolynomial(remainder);
+-	log2 AsciiPrinter(Stderr).printNewLine();
++	gfan_log2 AsciiPrinter(Stderr).printString("Remainder: ");
++	gfan_log2 AsciiPrinter(Stderr).printPolynomial(remainder);
++	gfan_log2 AsciiPrinter(Stderr).printNewLine();
+ 	if(!remainder.isZero())
+ 	  {
+ 	    log1 AsciiPrinter(Stderr).printString("Polynomial not in ideal: ");

Added: head/math/gfan/files/patch-src_app__fiberpolytope.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_app__fiberpolytope.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/app_fiberpolytope.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/app_fiberpolytope.cpp
+@@ -166,7 +166,7 @@ class FiberPolytopeApplication : public GFanApplicatio
+ 		    for(PolyhedralFan::coneIterator i=f1.conesBegin();i!=f1.conesEnd();i++)
+ 			{
+ 		    	static int a;
+-		    	log2 cerr<<"Processing Cone "<<a++<<" which has dimension "<<i->dimension()<<endl;
++		    	gfan_log2 cerr<<"Processing Cone "<<a++<<" which has dimension "<<i->dimension()<<endl;
+ 		    	SecondaryFanTraverser traverser(triangulationWithFullDimensionalIntersection(t,*i),*i);
+ 				symmetricTraverse(traverser,target,&s);
+ 			}

Added: head/math/gfan/files/patch-src_app__groebnerfan.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_app__groebnerfan.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,20 @@
+--- src/app_groebnerfan.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/app_groebnerfan.cpp
+@@ -74,7 +74,7 @@ class GroebnerFanApplication : public GFanApplication 
+ 	{
+ 	  log1 fprintf(Stderr,"Computing Groebner Basis...\n");
+ 	  buchberger(&g,StandardGradedLexicographicTermOrder());
+-	  log2 AsciiPrinter(Stderr).printPolynomialSet(g);
++	  gfan_log2 AsciiPrinter(Stderr).printPolynomialSet(g);
+ 	}
+       log1 fprintf(Stderr,"A reduced Groebner basis has been computed\n");
+ 
+@@ -113,7 +113,7 @@ class GroebnerFanApplication : public GFanApplication 
+ 	    for(PolyhedralFan::coneIterator i=f1.conesBegin();i!=f1.conesEnd();i++)
+ 		{
+ 	    	static int t;
+-	    	log2 cerr<<"Processing Cone "<<t++<<" which has dimension "<<i->dimension()<<endl;
++	    	gfan_log2 cerr<<"Processing Cone "<<t++<<" which has dimension "<<i->dimension()<<endl;
+ 	    	GroebnerFanTraverser traverser(groebnerBasisWithFullDimensionalIntersection(g,*i),*i);
+     		SymmetricTargetCounterInterrupted target2(target,optionInterrupt.getValue());
+ 			symmetricTraverse(traverser,target2,&s);

Added: head/math/gfan/files/patch-src_app__main.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_app__main.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/app_main.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/app_main.cpp
+@@ -143,7 +143,7 @@ class GCats : public GFanApplication (public)
+ 	{
+ 	  log1 fprintf(Stderr,"Computing Groebner Basis...\n");
+ 	  buchberger(&g,StandardGradedLexicographicTermOrder());
+-	  log2 AsciiPrinter(Stderr).printPolynomialSet(g);
++	  gfan_log2 AsciiPrinter(Stderr).printPolynomialSet(g);
+ 	}
+       log1 fprintf(Stderr,"A reduced Groebner basis has been computed\n");
+     }

Added: head/math/gfan/files/patch-src_app__resultantfan.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_app__resultantfan.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,24 @@
+--- src/app_resultantfan.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/app_resultantfan.cpp
+@@ -164,7 +164,7 @@ class ResultantFanApplication : public GFanApplication
+               for(IntegerVectorList::const_iterator i=linealityGen.begin();i!=linealityGen.end();i++)temp.push_back(*i);
+               for(IntegerVectorList::const_iterator i=gen.begin();i!=gen.end();i++)temp.push_back(*i);
+ 
+-              if(::rank(rowsToIntegerMatrix(temp,N))!=N){log2 debug<<"Skipping\n";continue;}
++              if(::rank(rowsToIntegerMatrix(temp,N))!=N){gfan_log2 debug<<"Skipping\n";continue;}
+             }
+ 
+ 
+@@ -182,10 +182,10 @@ class ResultantFanApplication : public GFanApplication
+           C.canonicalize();
+    //       debug<<toNonSpecialSubspace(gen,*special);
+   //        debug<<toNonSpecialSubspace(linealityGen,*special);
+-          log2 debug<<":"<<C.dimension()<<"\n";
++          gfan_log2 debug<<":"<<C.dimension()<<"\n";
+           if(C.dimension()==n-1)
+             {
+-              log2 debug<<"adding\n";
++              gfan_log2 debug<<"adding\n";
+               F.push_back(C);
+             }
+         }

Added: head/math/gfan/files/patch-src_app__secondaryfan.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_app__secondaryfan.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/app_secondaryfan.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/app_secondaryfan.cpp
+@@ -385,7 +385,7 @@ class SecondaryFanApplication : public GFanApplication
+ 		    for(PolyhedralFan::coneIterator i=f1.conesBegin();i!=f1.conesEnd();i++)
+ 			{
+ 		    	static int a;
+-		    	log2 cerr<<"Processing Cone "<<a++<<" which has dimension "<<i->dimension()<<endl;
++		    	gfan_log2 cerr<<"Processing Cone "<<a++<<" which has dimension "<<i->dimension()<<endl;
+ 		    	SecondaryFanTraverser traverser(triangulationWithFullDimensionalIntersection(t,*i),*i);
+ 				SymmetricTargetCounterInterrupted target2(target,optionInterrupt.getValue());
+ 				symmetricTraverse(traverser,target2,&s);

Added: head/math/gfan/files/patch-src_app__tropicalintersection.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_app__tropicalintersection.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/app_tropicalintersection.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/app_tropicalintersection.cpp
+@@ -37,7 +37,7 @@ class SymmetricTargetTropicalBasisTester : public Symm
+ 	bool process(ConeTraverser &traverser)
+ 	{
+ 		IntegerVector w=traverser.refToPolyhedralCone().getRelativeInteriorPoint();
+-		log2 AsciiPrinter(Stderr) << "Testing weight vector:\n"<<w<<"\n";
++		gfan_log2 AsciiPrinter(Stderr) << "Testing weight vector:\n"<<w<<"\n";
+ 		WeightReverseLexicographicTermOrder T(w);
+ 		buchberger(&g,T);
+ 		PolynomialSet temp=initialForms(g,w);

Added: head/math/gfan/files/patch-src_app__tropicaltraverse.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_app__tropicaltraverse.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,13 @@
+--- src/app_tropicaltraverse.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/app_tropicaltraverse.cpp
+@@ -93,8 +93,8 @@ class TropicalTraverseApplication : public GFanApplica
+ 	s.computeClosure(generators);
+ 	  s.createTrie();
+ 
+-	  log2 s.print(Stderr);
+-	log2 fprintf(Stderr,"\n");
++	  gfan_log2 s.print(Stderr);
++	gfan_log2 fprintf(Stderr,"\n");
+       }
+     if(optionTorusSymmetry.getValue() && !optionSymmetry.getValue())
+       {

Added: head/math/gfan/files/patch-src_bergman.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_bergman.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,117 @@
+--- src/bergman.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/bergman.cpp
+@@ -79,15 +79,15 @@ BergmanFan bergmanRayIntersection(PolynomialSet const 
+   //  fprintf(Stderr,"---------------------------------------------------------\n");
+ 
+ 
+-  log2  cerr<<"BBLABL";
++  gfan_log2  cerr<<"BBLABL";
+   for(IntegerVectorList::const_iterator i=rays.begin();i!=rays.end();i++)
+     {
+-      log2 cerr<<"1";
++      gfan_log2 cerr<<"1";
+       PolynomialSet g=idealGroebnerBasis;
+       g=GE_groebnerBasis(g,WeightReverseLexicographicTermOrder(*i),true,false);//Set to true?
+       //      buchberger(&g,WeightReverseLexicographicTermOrder(*i));
+       PolynomialSet cg=initialFormsAssumeMarked(g,*i);
+-      log2 cerr<<"2";
++      gfan_log2 cerr<<"2";
+  
+       bool inList=false;
+       for(BergmanFan::MaximalConeList::const_iterator j=bfan.cones.begin();j!=bfan.cones.end();j++)
+@@ -98,14 +98,14 @@ BergmanFan bergmanRayIntersection(PolynomialSet const 
+ 	      break;
+ 	    }
+ 	}
+-      log2 cerr<<"3";
++      gfan_log2 cerr<<"3";
+       if(!inList)
+ 	{
+ 	  bfan.cones.push_back(BergmanFan::MaximalCone(cg,g,true,maximalConeLabel++));
+ 	}
+-      log2 cerr<<"4";
++      gfan_log2 cerr<<"4";
+     }
+-  log2 cerr<<"BBLAB  END";
++  gfan_log2 cerr<<"BBLAB  END";
+   //  AsciiPrinter temp(Stderr);
+   //  bfan.print(temp);
+   return bfan;
+@@ -631,7 +631,7 @@ BergmanFan bergman(PolynomialSet const &coneGroebnerBa
+ 			     symmetry checks were algebraic and not
+ 			     geometric*/
+ 			  //  assert(i->idealGroebnerBasis.isMarked());
+-			  log2 cerr<<"8";
++			  gfan_log2 cerr<<"8";
+ 
+ 			  PolynomialSet g2(theRing);
+ 			  WeightTermOrder termOrder(termorderWeight(initialIdeal));
+@@ -639,14 +639,14 @@ BergmanFan bergman(PolynomialSet const &coneGroebnerBa
+ 			  for(PolynomialSet::const_iterator j=i->idealGroebnerBasis.begin();j!=i->idealGroebnerBasis.end();j++)
+ 			    g2.push_back(divisionLift(*j, initialIdeal, current.idealGroebnerBasis, termOrder));
+ 			  assert(g2.isMarked());
+-			  log2 cerr<<"9";
++			  gfan_log2 cerr<<"9";
+ 			
+ 			 
+ 			  if(1)
+ 			    {
+-			      log2 cerr << "AUTOREDUCTION";
++			      gfan_log2 cerr << "AUTOREDUCTION";
+ 			      autoReduce(&g2,LexicographicTermOrder());
+-			      log2 cerr << "AUTOREDUCTION END"<<endl;
++			      gfan_log2 cerr << "AUTOREDUCTION END"<<endl;
+ 			    }
+ 			  else
+ 			    {
+@@ -655,17 +655,17 @@ BergmanFan bergman(PolynomialSet const &coneGroebnerBa
+ 			      log0 cerr << "RESTRICTED AUTOREDUCTION END"<<endl;
+ 			    }
+ 			  ConeOrbit tempConeOrbit(*symmetryGroup,i->coneGroebnerBasis,g2,-1);
+-			  log2 cerr<<"0";
++			  gfan_log2 cerr<<"0";
+ 			  IntegerVector relIntFacetVector=tempConeOrbit.getStableRay();
+ 
+-			  log2 cerr<<"A";
++			  gfan_log2 cerr<<"A";
+ 
+ 			  int label=-1;
+ 			  IntegerVector labelPermutation;
+ 			  if(!active.containsAndMark(relIntFacetVector,relIntRidgeVector,&label,&labelPermutation))
+ 			    //			  if(!active.containsAndMark(i->coneGroebnerBasis,initialIdeal,&label,&labelPermutation))
+ 			    {
+-			  log2 cerr<<"B";
++			  gfan_log2 cerr<<"B";
+ 			      if(!ret.contains(i->coneGroebnerBasis))
+ 				{
+ 				  label=maximalConeLabel++;
+@@ -680,13 +680,13 @@ BergmanFan bergman(PolynomialSet const &coneGroebnerBa
+ 				{
+ 				  assert(0);//Can this ever happen? REMOVE JAN 2009
+ 				}
+-			  log2 cerr<<"C";
++			  gfan_log2 cerr<<"C";
+ 			    }
+-			  log2 cerr<<"D";
++			  gfan_log2 cerr<<"D";
+ 			  ret.codimensionOneCones.back().incidenceList.push_back(label);
+-			  log2 cerr<<"E";
++			  gfan_log2 cerr<<"E";
+ 			  ret.codimensionOneCones.back().incidencePermutationList.push_back(labelPermutation);
+-			  log2 cerr<<"F";
++			  gfan_log2 cerr<<"F";
+ 			}
+ 		    }
+ 		    //		  else
+@@ -898,9 +898,9 @@ PolyhedralFan BergmanFan::toPolyhedralFan()const
+       //PolyhedralCone c1(wallInequalities(i->idealGroebnerBasis),wallInequalities(i->coneGroebnerBasis));
+       //      PolyhedralCone c1(wallFlipableNormals(i->idealGroebnerBasis,false),wallInequalities(i->coneGroebnerBasis),n);
+       PolyhedralCone c1=i->theCone;
+-      log2 fprintf(Stderr,"Cononicalising...\n");
++      gfan_log2 fprintf(Stderr,"Cononicalising...\n");
+       c1.canonicalize();
+-      log2 fprintf(Stderr,"... done canonicalising...\n");
++      gfan_log2 fprintf(Stderr,"... done canonicalising...\n");
+       //      fprintf(Stderr,"a\n");
+       //      for(SymmetryGroup::ElementContainer::const_iterator j=symmetryGroup.elements.begin();j!=symmetryGroup.elements.end();j++)
+       //	{

Added: head/math/gfan/files/patch-src_breadthfirstsearch.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_breadthfirstsearch.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,29 @@
+--- src/breadthfirstsearch.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/breadthfirstsearch.cpp
+@@ -259,7 +259,7 @@ class Orbit{ (public)
+ 	//	fprintf(Stderr,"1b\n");
+       }
+ 
+-    log2 fprintf(Stderr,"numFixed = %i\n",numFixed);
++    gfan_log2 fprintf(Stderr,"numFixed = %i\n",numFixed);
+     return groupSize/numFixed;
+   }
+ };
+@@ -368,7 +368,7 @@ void BreadthFirstSearch::enumerate(const PolynomialSet
+ 	static int n;
+ 	n++;
+ 	if(!(n%10))
+-	  log2 fprintf(Stderr,"%i\n",n);
++	  gfan_log2 fprintf(Stderr,"%i\n",n);
+       }
+        log3  fprintf(Stderr,"Active set:\n");
+        log3 active.print(Stderr);
+@@ -484,7 +484,7 @@ void BreadthFirstSearch::enumerate(const PolynomialSet
+ 		    }
+ 		  else
+ 		    {
+-		      // log2 fprintf(Stderr,"-- marked\n");
++		      // gfan_log2 fprintf(Stderr,"-- marked\n");
+ 		    }
+ 		}
+ 	    }

Added: head/math/gfan/files/patch-src_buchberger.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_buchberger.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,44 @@
+--- src/buchberger.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/buchberger.cpp
+@@ -65,7 +65,7 @@ void buchberger/*Simple*/(PolynomialSet *g, TermOrder 
+ 		return buchberger2(g, termOrder, allowSaturation);
+ 	//return buchbergerChain(g, termOrder, allowSaturation);
+ 	PolynomialRing theRing=g->getRing();
+-  //  log2 fprintf(Stderr,"ENTERING buchberger\n");
++  //  gfan_log2 fprintf(Stderr,"ENTERING buchberger\n");
+   TimerScope ts(&buchbergerTimer);
+   PolynomialSet sPolynomials(theRing);
+ 
+@@ -136,11 +136,11 @@ void buchberger/*Simple*/(PolynomialSet *g, TermOrder 
+     //  else
+     //	  pout<<"ZERO\n";
+     }
+-  //log2  fprintf(Stderr," buchberger minimize\n");
++  //gfan_log2  fprintf(Stderr," buchberger minimize\n");
+   minimize(g);
+-  //log2 fprintf(Stderr," buchberger autoreduce\n");
++  //gfan_log2 fprintf(Stderr," buchberger autoreduce\n");
+   autoReduce(g,termOrder);
+-  //log2 fprintf(Stderr,"LEAVING buchberger\n\n");
++  //gfan_log2 fprintf(Stderr,"LEAVING buchberger\n\n");
+ 
+   cerr<<"NumberOfReductions: "<<numberOfReductions<<std::endl;
+ }
+@@ -496,7 +496,7 @@ void buchberger2(PolynomialSet *g, TermOrder const &te
+           g->push_back(p);
+           G.push_back(p);
+           numberOfUsefulCriticalPairs++;
+-          log2
++          gfan_log2
+           {
+         	  static int t;
+         	  if(((++t)&=31)==0)
+@@ -587,7 +587,7 @@ bool isMarkedGroebnerBasis(PolynomialSet const &g)
+   int counter=0;
+   for(PolynomialSet::const_iterator i=g.begin();i!=g.end();i++)
+     {
+-    log2 fprintf(Stderr,"%i ",counter++);
++    gfan_log2 fprintf(Stderr,"%i ",counter++);
+     for(PolynomialSet::const_iterator j=i;j!=g.end();j++)
+       if(!relativelyPrime(i->getMarked().m.exponent,j->getMarked().m.exponent))
+ 	{

Added: head/math/gfan/files/patch-src_codimoneconnectedness.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_codimoneconnectedness.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,10 @@
+--- src/codimoneconnectedness.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/codimoneconnectedness.cpp
+@@ -33,6 +33,6 @@ bool CodimOneConnectednessTester::isConnected()const
+       g.addEdge(facetIndex,nFacets+(lower_bound(allRidges2.begin(),allRidges2.end(),*j)-allRidges2.begin()));
+ 
+   int diameter=g.diameter();
+-  log2 cerr << "Diameter " << diameter << " nFacets " << nFacets << " nRidges " << nRidges << endl;
++  gfan_log2 cerr << "Diameter " << diameter << " nFacets " << nFacets << " nRidges " << nRidges << endl;
+   return diameter<nFacets+nRidges;
+ }

Added: head/math/gfan/files/patch-src_enumeration.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_enumeration.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/enumeration.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/enumeration.cpp
+@@ -72,7 +72,7 @@ void EnumerationAlgorithm::printProgress(int step)
+       //      if(!(progressCounter&4095))
+ 	//      if(!(progressCounter&255))
+       if(!(progressCounter&15))
+-	log2 fprintf(Stderr,"Number of Gr\"obner Bases found %i\n",progressCounter);
++	gfan_log2 fprintf(Stderr,"Number of Gr\"obner Bases found %i\n",progressCounter);
+       fflush(Stderr);
+       step--;
+     }

Added: head/math/gfan/files/patch-src_ep__xfig.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_ep__xfig.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,17 @@
+--- src/ep_xfig.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/ep_xfig.cpp
+@@ -75,12 +75,12 @@ bool XfigEnumerationPrinter::basis(const PolynomialSet
+             }
+         }
+ 
+-  log2 xfig->printPolygon(p);
++  gfan_log2 xfig->printPolygon(p);
+   xfig->drawPolygon(p,0);
+ 
+   basisCounter++;
+ 
+-  log2 fprintf(Stderr,"basisCounter:%i\n",basisCounter);
++  gfan_log2 fprintf(Stderr,"basisCounter:%i\n",basisCounter);
+ 
+   return true;
+ }

Added: head/math/gfan/files/patch-src_field__rationals.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_field__rationals.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/field_rationals.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/field_rationals.cpp
+@@ -402,7 +402,7 @@ const char *FieldRationalsImplementation::name()
+   list=this;
+   */
+ /*
+-  log2 fprintf(Stderr,"Initializing field Rationals\n");
++  gfan_log2 fprintf(Stderr,"Initializing field Rationals\n");
+ }
+ */
+ 				//FieldRationals Q;

Added: head/math/gfan/files/patch-src_gfanlib__polyhedralfan.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_gfanlib__polyhedralfan.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,38 @@
+--- src/gfanlib_polyhedralfan.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/gfanlib_polyhedralfan.cpp
+@@ -221,10 +221,10 @@ PolyhedralFan PolyhedralFan::fullComplex()const
+ 
+   while(1)
+     {
+-      log2 debug<<"looping";
++      gfan_log2 debug<<"looping";
+       bool doLoop=false;
+       PolyhedralFan facets=ret.facetComplex();
+-      log2 debug<<"number of facets"<<facets.size()<<"\n";
++      gfan_log2 debug<<"number of facets"<<facets.size()<<"\n";
+       for(PolyhedralConeList::const_iterator i=facets.cones.begin();i!=facets.cones.end();i++)
+         if(!ret.contains(*i))
+           {
+@@ -561,7 +561,7 @@ std::string PolyhedralFan::toString(int flags)const
+         static int t;
+ //        log1 fprintf(Stderr,"Adding faces of cone %i\n",t++);
+       }
+-//      log2 fprintf(Stderr,"Dim: %i\n",i->dimension());
++//      gfan_log2 fprintf(Stderr,"Dim: %i\n",i->dimension());
+ 
+       addFacesToSymmetricComplex(symCom,*i,i->getHalfSpaces(),generatorsOfLinealitySpace);
+     }
+@@ -706,11 +706,11 @@ PolyhedralFan PolyhedralFan::readFan(string const &fil
+ 
+     PolyhedralFan ret(n);
+ 
+-    log2 cerr<< "Number of orbits to expand "<<cones.size()<<endl;
++    gfan_log2 cerr<< "Number of orbits to expand "<<cones.size()<<endl;
+     for(int i=0;i<cones.size();i++)
+       if(coneIndices==0 || coneIndices->count(i))
+         {
+-          log2 cerr<<"Expanding symmetries of cone"<<endl;
++          gfan_log2 cerr<<"Expanding symmetries of cone"<<endl;
+           {
+             IntegerVectorList coneRays;
+             for(list<int>::const_iterator j=cones[i].begin();j!=cones[i].end();j++)

Added: head/math/gfan/files/patch-src_gfanlib__symmetriccomplex.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_gfanlib__symmetriccomplex.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/gfanlib_symmetriccomplex.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/gfanlib_symmetriccomplex.cpp
+@@ -554,7 +554,7 @@ IntegerMatrix SymmetricComplex::boundaryMap(int d)
+           static int t;
+   //        log1 fprintf(Stderr,"Adding faces of cone %i\n",t++);
+         }
+-  //      log2 fprintf(Stderr,"Dim: %i\n",i->dimension());
++  //      gfan_log2 fprintf(Stderr,"Dim: %i\n",i->dimension());
+ 
+         addFacesToSymmetricComplex(symCom,*i,i->getHalfSpaces(),generatorsOfLinealitySpace);
+       }

Added: head/math/gfan/files/patch-src_gfanlib__zfan.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_gfanlib__zfan.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,16 @@
+--- src/gfanlib_zfan.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/gfanlib_zfan.cpp
+@@ -162,11 +162,11 @@ namespace gfan
+ 
+         ZFan ret(sym);
+ 
+-//        log2 cerr<< "Number of orbits to expand "<<cones.size()<<endl;
++//        gfan_log2 cerr<< "Number of orbits to expand "<<cones.size()<<endl;
+         for(unsigned i=0;i<cones.size();i++)
+         //  if(coneIndices==0 || coneIndices->count(i))
+             {
+-//              log2 cerr<<"Expanding symmetries of cone"<<endl;
++//              gfan_log2 cerr<<"Expanding symmetries of cone"<<endl;
+               {
+                 ZMatrix coneRays(0,n);
+                 for(list<int>::const_iterator j=cones[i].begin();j!=cones[i].end();j++)

Added: head/math/gfan/files/patch-src_halfopencone.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_halfopencone.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,172 @@
+--- src/halfopencone.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/halfopencone.cpp
+@@ -602,7 +602,7 @@ void tropicalHyperSurfaceIntersectionWithProcessor(int
+       intersectionOld.print(&P);
+ 	*/
+       }
+-  log2 fprintf(Stderr,"Halfopen intersection completed.\n");
++  gfan_log2 fprintf(Stderr,"Halfopen intersection completed.\n");
+ }
+ 
+ PolyhedralFan tropicalHyperSurfaceIntersectionClosed(int dimension, PolynomialSet const &g, PolyhedralCone *restrictingCone, bool expand, bool saveResult, int intervalLow, int intervalHigh)
+@@ -1296,7 +1296,7 @@ struct RecursionData (public)
+ 
+     if(index == fans.size())
+       {
+-	log2 fprintf(Stderr,"ADDING CONE\n");
++	gfan_log2 fprintf(Stderr,"ADDING CONE\n");
+ 	//ret.push_back(current);
+ 	processor.process(current,chosenFans,chosen);
+ 	numberOfUsefulCalls++;
+@@ -1339,7 +1339,7 @@ struct RecursionData (public)
+ 
+ 	static int iterationNumber;
+ 	if(!(iterationNumber++ & 31))
+-	  log2
++	  gfan_log2
+ 	{
+ 	  fprintf(Stderr,"Iteration level:%i, Chosen fan:%i, Number of candidates:%i, Iteration Number:%i, Useful (%i/%i)=%f\n",index,bestIndex,bestNumberOfCandidates,iterationNumber,numberOfUsefulCalls,totalNumberOfCalls,float(numberOfUsefulCalls)/totalNumberOfCalls);
+ 	  fprintf(Stderr,"Chosen fans vector: ");
+@@ -1490,7 +1490,7 @@ struct RecursionData (public)
+   }
+   bool closure()
+   {
+-    log2 cerr<<"computing closure"<<endl;
++    gfan_log2 cerr<<"computing closure"<<endl;
+     bool ret=false;
+     int a=0;
+     for(int f1=0;f1<fans.size();f1++)
+@@ -1532,8 +1532,8 @@ struct RecursionData (public)
+ 		  }
+ 	      }
+       }
+-    log2 fprintf(Stderr,"%i FOR FREE\n",a);
+-    log2 cerr<<"done computing closure"<<endl;
++    gfan_log2 fprintf(Stderr,"%i FOR FREE\n",a);
++    gfan_log2 cerr<<"done computing closure"<<endl;
+     return ret;
+   }
+ 
+@@ -1607,8 +1607,8 @@ struct RecursionData (public)
+ 		freeLPs++;
+ 	      }
+     //    table.print();
+-//    log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data2.table.numberOfSolvedLPs);
+-    log2 fprintf(Stderr,"Number of infeassible LPs discovered from higherdimensional cones: %i\n",freeLPs);
++//    gfan_log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data2.table.numberOfSolvedLPs);
++    gfan_log2 fprintf(Stderr,"Number of infeassible LPs discovered from higherdimensional cones: %i\n",freeLPs);
+   }
+ };
+ 
+@@ -1630,9 +1630,9 @@ void tropicalHyperSurfaceIntersection(int dimension, P
+ 	HalfOpenConeList l,lf;
+ 	buildFanFromPolynomial(*i, &lf, &l, &(parents[I]),restrictingCone);
+ 
+-	log2 AsciiPrinter(Stderr).printVector(parents[I]);
++	gfan_log2 AsciiPrinter(Stderr).printVector(parents[I]);
+ 
+-	log2 fprintf(Stderr,"\n");
++	gfan_log2 fprintf(Stderr,"\n");
+ 
+ 	vector<HalfOpenCone> L;
+ 	for(HalfOpenConeList::const_iterator i=l.begin();i!=l.end();i++)
+@@ -1658,7 +1658,7 @@ void tropicalHyperSurfaceIntersection(int dimension, P
+ //  data.table.print();//HERE
+   IntegerVectorList empty;
+   data.rek(0, HalfOpenCone(dimension,empty,empty,empty));
+-  log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data.table.numberOfSolvedLPs);
++  gfan_log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data.table.numberOfSolvedLPs);
+ }
+ 
+ 
+@@ -1861,7 +1861,7 @@ void tropicalHyperSurfaceIntersectionInSubspace(int di
+     are gotten as the pull-back of the lower dimensional equations by
+     this normal form map.
+    */
+-  log2 cerr<<"Projecting Newton polytopes modulo the homogeneity space.";
++  gfan_log2 cerr<<"Projecting Newton polytopes modulo the homogeneity space.";
+ 
+   int N=G.getRing().getNumberOfVariables();
+   IntegerVectorList w=wallInequalities(G);
+@@ -1887,7 +1887,7 @@ void tropicalHyperSurfaceIntersectionInSubspace(int di
+       restrictingCone=&restrictedConeNew;
+     }
+ 
+-  log2 cerr<<"Done projecting Newton polytopes modulo the homogeneity space.";
++  gfan_log2 cerr<<"Done projecting Newton polytopes modulo the homogeneity space.";
+   /*
+     Now do the computation with the new set of polynomials.
+    */
+@@ -1895,7 +1895,7 @@ void tropicalHyperSurfaceIntersectionInSubspace(int di
+   /*
+     Here follows restriction to subspace cut out by the binomials.
+    */
+-  log2 cerr<<"Restricting to subspace determined by binomials and computing tropical hypersurfaces.";
++  gfan_log2 cerr<<"Restricting to subspace determined by binomials and computing tropical hypersurfaces.";
+ 
+   int n=g.getRing().getNumberOfVariables();
+   IntegerVectorList equations;
+@@ -1937,12 +1937,12 @@ void tropicalHyperSurfaceIntersectionInSubspace(int di
+   for(PolynomialSet::const_iterator i=g.begin();i!=g.end();i++)
+     if(i->numberOfTerms()!=2)
+       {
+-	log2 cerr << I;
++	gfan_log2 cerr << I;
+ 	HalfOpenConeList l,lf;
+-	log2 cerr<< "Building fan"<<endl;
++	gfan_log2 cerr<< "Building fan"<<endl;
+ 	buildFanFromPolynomial(*i, &lf, &l, &(parents[I]),restrictingCone);
+-	log2 cerr<< "Number of cones:" << lf.size()<<","<< l.size()<<endl;
+-	log2 cerr<< "rewriting"<<endl;
++	gfan_log2 cerr<< "Number of cones:" << lf.size()<<","<< l.size()<<endl;
++	gfan_log2 cerr<< "rewriting"<<endl;
+ 
+ 	vector<HalfOpenCone> L;
+ 	for(HalfOpenConeList::const_iterator i=l.begin();i!=l.end();i++)
+@@ -1953,10 +1953,10 @@ void tropicalHyperSurfaceIntersectionInSubspace(int di
+ 
+ 	fullDimFanList.push_back(F);
+ 	coDimOneFanList.push_back(L);
+-	log2 cerr<< "Done Building fan"<<endl;
++	gfan_log2 cerr<< "Done Building fan"<<endl;
+ 	I++;
+       }
+-  log2 cerr<<"Done computing tropical hypersurfaces.";
++  gfan_log2 cerr<<"Done computing tropical hypersurfaces.";
+ 
+   /* Now we must create a new HalfOpenConeProcessor and tell it how to expand a cone.
+      We must insert the pivot columns from A and add in the equtions gotten from the binomials.
+@@ -1974,12 +1974,12 @@ void tropicalHyperSurfaceIntersectionInSubspace(int di
+ 
+ 
+   IntegerVectorList empty;
+-  log2 cerr<<"Doing intersection.";
++  gfan_log2 cerr<<"Doing intersection.";
+   if(intervalHigh!=-1)data.setInterval(intervalLow,intervalHigh);
+   data.rek(0, HalfOpenCone(nonPivots.size(),empty,empty,empty));
+-  log2 cerr<<"Done doing intersection.";
++  gfan_log2 cerr<<"Done doing intersection.";
+   //  data.rek(0, HalfOpenCone(dimension,empty,empty,empty));
+-  //  log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data.table.numberOfSolvedLPs);
++  //  gfan_log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data.table.numberOfSolvedLPs);
+ 
+   /*  HalfOpenConeList ret;
+ 
+@@ -2151,7 +2151,7 @@ bool hasMixedCellOfDimension(PolynomialSet const &g, i
+   IntegerVectorList empty;
+   data.rek(0, HalfOpenCone(g.getRing().getNumberOfVariables(),empty,empty,empty));
+ 
+-  log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data.table.numberOfSolvedLPs);
++  gfan_log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data.table.numberOfSolvedLPs);
+ 
+   if(maximalSeen)*maximalSeen=p.getMaximalDimensionFound();
+ 
+@@ -2185,7 +2185,7 @@ bool hasMixedCellOfDimension(list<list<IntegerVector> 
+   IntegerVectorList empty;
+   data.rek(0, HalfOpenCone(/*g.getRing().getNumberOfVariables()*/d,empty,empty,empty));
+ 
+-  log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data.table.numberOfSolvedLPs);
++  gfan_log2 fprintf(Stderr,"LPs solved:%i for relation table\n",data.table.numberOfSolvedLPs);
+ 
+   if(maximalSeen)*maximalSeen=p.getMaximalDimensionFound();
+ 

Added: head/math/gfan/files/patch-src_linalg.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_linalg.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/linalg.cpp.orig	2017-09-08 14:13:16 UTC
++++ src/linalg.cpp
+@@ -885,7 +885,7 @@ IntegerVector vectorInKernel(IntegerMatrix const &m) /
+ 		return ret;
+ 	}
+ 	fallback:
+-	log2 debug << "LINALG FALLBACK\n";
++	gfan_log2 debug << "LINALG FALLBACK\n";
+ 
+ 
+   FieldMatrix m2=integerMatrixToFieldMatrix(m,Q);

Added: head/math/gfan/files/patch-src_log.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_log.h	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/log.h.orig	2017-06-20 14:47:37 UTC
++++ src/log.h
+@@ -14,7 +14,7 @@ void setLogLevel(int l);
+ #define log0 if(logLevel>=0)
+ 
+ #define log1 if(logLevel>=1)
+-#define log2 if(logLevel>=2)
++#define gfan_log2 if(logLevel>=2)
+ #define log3 if(logLevel>=3)
+ 
+ #endif

Added: head/math/gfan/files/patch-src_lp__soplexcdd.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_lp__soplexcdd.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,20 @@
+--- src/lp_soplexcdd.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/lp_soplexcdd.cpp
+@@ -536,7 +536,7 @@ if(0)	     {
+ 	     debug<<"\n";
+ 	     D(s);
+ */
+-	     log2 fprintf(Stderr,"Solution failed (Type2).\n");
++	     gfan_log2 fprintf(Stderr,"Solution failed (Type2).\n");
+ 
+ 	     /*	     for(int i=0;i<work.nCols();i++)
+ 	       {
+@@ -578,7 +578,7 @@ if(0)	     {
+ 		 return false;
+ 	       }
+ 	     
+-	       log2 fprintf(Stderr,"Certificate failed (Type2).\n");
++	       gfan_log2 fprintf(Stderr,"Certificate failed (Type2).\n");
+ 	       /* std::cerr<< work;
+ 	      std::cerr<< farkasx;
+ 	     AsciiPrinter(Stderr).printVector(c);

Added: head/math/gfan/files/patch-src_padic.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_padic.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,28 @@
+--- src/padic.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/padic.cpp
+@@ -406,14 +406,14 @@ void pAdicBuchberger(PolynomialSet &g, int prime, Inte
+   for(PolynomialSet::const_iterator i=g.begin();i!=g.end();i++)
+     for(PolynomialSet::const_iterator j=g.begin();j!=i;j++)
+       {
+-log2        debug<<"checking s poly\n"<<*i<<"("<<ST(*i,prime,omega,tieBreaker)<<")"<<"\n"<<*j<<"("<<ST(*j,prime,omega,tieBreaker)<<")"<<"\n";
++gfan_log2        debug<<"checking s poly\n"<<*i<<"("<<ST(*i,prime,omega,tieBreaker)<<")"<<"\n"<<*j<<"("<<ST(*j,prime,omega,tieBreaker)<<")"<<"\n";
+         Polynomial f=SPolynomial(*i,*j,prime,omega,tieBreaker);
+ //        debug<<"S="<<f<<"\n";
+ // Enable the relatively prime criterion by uncommenting this following:
+ #if 1
+         if(relativelyPrime(ST(*i,prime,omega,tieBreaker).m.exponent,ST(*j,prime,omega,tieBreaker).m.exponent))
+           {
+-log2            debug<<"SKIPPING\n";
++gfan_log2            debug<<"SKIPPING\n";
+           }
+         else
+ #endif
+@@ -424,7 +424,7 @@ log2            debug<<"SKIPPING\n";
+         f=longDivision(f,g,prime,omega,tieBreaker,H,u);
+         if(!f.isZero())
+           {
+-log2            debug<<"Adding:"<<f<<"\n";
++gfan_log2            debug<<"Adding:"<<f<<"\n";
+             g.push_back(f);
+           }
+         }

Added: head/math/gfan/files/patch-src_polyhedralcone.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_polyhedralcone.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/polyhedralcone.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/polyhedralcone.cpp
+@@ -879,7 +879,7 @@ IntegerVectorList PolyhedralCone::extremeRays(IntegerV
+ 	    ret.push_back(u);
+ 	  else
+ 	    {
+-	      log2 fprintf(Stderr,"Remember to fix cdd double description interface\n");
++	      gfan_log2 fprintf(Stderr,"Remember to fix cdd double description interface\n");
+ 	    }
+ 	}
+     }

Added: head/math/gfan/files/patch-src_polyhedralfan.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_polyhedralfan.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,65 @@
+--- src/polyhedralfan.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/polyhedralfan.cpp
+@@ -400,10 +400,10 @@ PolyhedralFan PolyhedralFan::fullComplex()const
+ 
+   while(1)
+     {
+-      log2 debug<<"looping";
++      gfan_log2 debug<<"looping";
+       bool doLoop=false;
+       PolyhedralFan facets=ret.facetComplex();
+-      log2 debug<<"number of facets"<<facets.size()<<"\n";
++      gfan_log2 debug<<"number of facets"<<facets.size()<<"\n";
+       for(PolyhedralConeList::const_iterator i=facets.cones.begin();i!=facets.cones.end();i++)
+ 	if(!ret.contains(*i))
+ 	  {
+@@ -1232,7 +1232,7 @@ void addFacesToSymmetricComplex(SymmetricComplex &c, s
+ 
+       if(!c.contains(theCone))
+ 	{
+-	  log2
++	  gfan_log2
+ 	  {
+ 	    static int t;
+ 	    if((t&1023)==0)
+@@ -1317,7 +1317,7 @@ SymmetricComplex PolyhedralFan::toSymmetricComplex(Sym
+ 		static int t;
+ 		log1 fprintf(Stderr,"Adding faces of cone %i\n",t++);
+ 	      }
+-	      log2 fprintf(Stderr,"Dim: %i\n",i->dimension());
++	      gfan_log2 fprintf(Stderr,"Dim: %i\n",i->dimension());
+ 
+ 	      addFacesToSymmetricComplex(symCom,*i,i->getHalfSpaces(),generatorsOfLinealitySpace);
+ 	    }
+@@ -1387,7 +1387,7 @@ void PolyhedralFan::printWithIndices(class Printer *p,
+ 	static int t;
+ 	log1 fprintf(Stderr,"Adding faces of cone %i\n",t++);
+       }
+-      log2 fprintf(Stderr,"Dim: %i\n",i->dimension());
++      gfan_log2 fprintf(Stderr,"Dim: %i\n",i->dimension());
+ 
+       addFacesToSymmetricComplex(symCom,*i,i->getHalfSpaces(),generatorsOfLinealitySpace);
+     }
+@@ -1565,11 +1565,11 @@ PolyhedralFan PolyhedralFan::readFan(string const &fil
+ 
+     PolyhedralFan ret(n);
+ 
+-    log2 cerr<< "Number of orbits to expand "<<cones.size()<<endl;
++    gfan_log2 cerr<< "Number of orbits to expand "<<cones.size()<<endl;
+     for(int i=0;i<cones.size();i++)
+       if(coneIndices==0 || coneIndices->count(i))
+ 	{
+-	  log2 cerr<<"Expanding symmetries of cone"<<endl;
++	  gfan_log2 cerr<<"Expanding symmetries of cone"<<endl;
+ 	  /*	  for(SymmetryGroup::ElementContainer::const_iterator perm=sym->elements.begin();perm!=sym->elements.end();perm++)
+ 	    {
+ 	      IntegerVectorList coneRays;
+@@ -1851,7 +1851,7 @@ bool PolyhedralFan::isConnected(SymmetryGroup *sym)con
+ 
+   for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++)
+     {
+-      log2 cerr<<"Computing ridges of facet." << endl;
++      gfan_log2 cerr<<"Computing ridges of facet." << endl;
+       PolyhedralFan ridges=facetsOfCone(*i);
+       IntegerVectorList interiorPoints;
+       for(PolyhedralConeList::const_iterator j=ridges.cones.begin();j!=ridges.cones.end();j++)

Added: head/math/gfan/files/patch-src_reversesearch.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_reversesearch.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,33 @@
+--- src/reversesearch.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/reversesearch.cpp
+@@ -65,7 +65,7 @@ int ReverseSearch::treeSize(PolynomialSet &groebnerBas
+     static int n;
+     n++;
+     if(!(n%10))
+-      log2 fprintf(Stderr,"%i %i\n",n,depth);
++      gfan_log2 fprintf(Stderr,"%i %i\n",n,depth);
+   }
+ 
+   int s=1;
+@@ -144,17 +144,17 @@ int ReverseSearch::treeSize(PolynomialSet &groebnerBas
+ 
+ PolynomialSet ReverseSearch::findRoot(PolynomialSet groebnerBasis)
+ {
+-  log2 fprintf(Stderr,"Computing root\n");
+-  log2 buchberger(&groebnerBasis,termOrder);
++  gfan_log2 fprintf(Stderr,"Computing root\n");
++  gfan_log2 buchberger(&groebnerBasis,termOrder);
+ 
+   IntegerVector edge;
+   while(computeSearchEdge(groebnerBasis,&edge))
+     {
+-      log2 AsciiPrinter(Stderr).printVector(edge);
++      gfan_log2 AsciiPrinter(Stderr).printVector(edge);
+       groebnerBasis=flip(groebnerBasis,edge);
+     }
+ 
+-  log2 fprintf(Stderr,"Done computing root\n");
++  gfan_log2 fprintf(Stderr,"Done computing root\n");
+   return groebnerBasis;
+ }
+ 

Added: head/math/gfan/files/patch-src_singular.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_singular.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,28 @@
+--- src/singular.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/singular.cpp
+@@ -115,10 +115,10 @@ ring R=mySingularRingDegRevLex(idealGenerators.getRing
+         test|=(Sy_bit(OPT_REDSB)|Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_INTSTRATEGY));
+         test|=(Sy_bit(OPT_REDTHROUGH));
+ 
+-	log2 cerr<<"calling singular\n";
++	gfan_log2 cerr<<"calling singular\n";
+ 	//  debug<<"test"<<int(test)<<"\n";
+ 	ideal j=kStd(i,NULL,testHomog,NULL);
+-	log2 cerr<<"returning from singular\n";
++	gfan_log2 cerr<<"returning from singular\n";
+ 
+ 	idDelete(&i);
+ 	ret=fromSingularIdeal(ret.getRing(),j,R);
+@@ -175,10 +175,10 @@ ring R=mySingularRingDegRevLex(idealGenerators.getRing
+     ideal i=singularPolynomialSet(idealGenerators);
+     test|=(Sy_bit(OPT_REDSB)|Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_INTSTRATEGY));
+ 
+-    log2 cerr<<"calling singular\n";
++    gfan_log2 cerr<<"calling singular\n";
+     ideal j=kStd(i,NULL,testHomog,NULL);
+ 	//    ideal j=kInterRed(i);
+-    log2 cerr<<"returning from singular\n";
++    gfan_log2 cerr<<"returning from singular\n";
+ 
+     idDelete(&i);
+     ret=fromSingularIdeal(ret.getRing(),j,R);

Added: head/math/gfan/files/patch-src_symmetriccomplex.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_symmetriccomplex.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/symmetriccomplex.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/symmetriccomplex.cpp
+@@ -509,7 +509,7 @@ bool SymmetricComplex::isPure()const
+   int dim=-1;
+   for(ConeContainer::const_iterator i=cones.begin();i!=cones.end();i++)
+     {
+-      log2{static int a;if(!((a++)&63))fprintf(Stderr,"%i\n",a);}//log0
++      gfan_log2{static int a;if(!((a++)&63))fprintf(Stderr,"%i\n",a);}//log0
+     if(isMaximal(*i))
+       {
+ 	int dim2=i->dimension;

Added: head/math/gfan/files/patch-src_symmetry.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_symmetry.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,11 @@
+--- src/symmetry.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/symmetry.cpp
+@@ -631,7 +631,7 @@ void SymmetryGroup::createTrie()
+ 	int I=0;
+ 	for(ElementContainer::const_iterator i=elements.begin();i!=elements.end();i++,I++)
+ 		trie->insert(*i,I);
+-	log2 debug<<"Number of elements";log2 debug.printInteger(trie->size());log2 debug<<"\n";
++	gfan_log2 debug<<"Number of elements";gfan_log2 debug.printInteger(trie->size());gfan_log2 debug<<"\n";
+ 	log1 debug<<"Done creating symmetry trie.\n";
+ 
+ 	if(0)

Added: head/math/gfan/files/patch-src_traverser__stableintersection.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_traverser__stableintersection.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,20 @@
+--- src/traverser_stableintersection.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/traverser_stableintersection.cpp
+@@ -62,7 +62,7 @@ IntegerVectorList StableIntersectionTraverser::link(In
+ 
+ 	IntegerVectorList rays1=theLink.getRaysInPrintingOrder(0);
+ 
+-	log2 {
++	gfan_log2 {
+ 	  cerr<<"Ray candidates:"<<endl;
+ 	  AsciiPrinter(Stderr)<<rays1;
+ 	}
+@@ -80,7 +80,7 @@ IntegerVectorList StableIntersectionTraverser::link(In
+ 			rays2.push_back(ray.getUniquePoint());
+ 			//			rays2.push_back(*i);
+ 			}
+-	log2{
++	gfan_log2{
+ 	cerr<<"True rays:"<<endl;
+ 	AsciiPrinter(Stderr)<<rays2;
+ 	}

Added: head/math/gfan/files/patch-src_traverser__tropical.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gfan/files/patch-src_traverser__tropical.cpp	Fri Dec  4 18:17:32 2020	(r556996)
@@ -0,0 +1,75 @@
+--- src/traverser_tropical.cpp.orig	2017-06-20 14:47:37 UTC
++++ src/traverser_tropical.cpp
+@@ -41,12 +41,12 @@ void TropicalTraverser::updatePolyhedralCone()
+ 
+ void TropicalTraverser::changeCone(IntegerVector const &ridgeVector, IntegerVector const &rayVector)
+ {
+-log2 {
++gfan_log2 {
+ 	debug << "Interior point:"<<theCone.getUniquePoint()<<"\n";
+ 	debug << "Ridge:"<<ridgeVector<<"Ray:"<<rayVector<<"\n";
+ }
+ 	assert(idealGroebnerBasis.containsInClosedGroebnerCone(ridgeVector));
+-	  log2 cerr<<endl<<"Changing cone"<<endl;
++	  gfan_log2 cerr<<endl<<"Changing cone"<<endl;
+ 
+ 	//  assert(!containsMonomial(coneGroebnerBasis));
+ 
+@@ -59,7 +59,7 @@ log2 {
+ 	  WeightReverseLexicographicTermOrder T(rayVector);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012041817.0B4IHWC4054596>