Index: head/math/gfan/pkg-message =================================================================== --- head/math/gfan/pkg-message (revision 556995) +++ head/math/gfan/pkg-message (nonexistent) @@ -1,16 +0,0 @@ -[ -{ type: install - message: < Index: head/math/gfan/files/patch-src_app__doesidealcontain.cpp =================================================================== --- head/math/gfan/files/patch-src_app__doesidealcontain.cpp (nonexistent) +++ head/math/gfan/files/patch-src_app__doesidealcontain.cpp (revision 556996) @@ -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: "); Property changes on: head/math/gfan/files/patch-src_app__doesidealcontain.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_app__fiberpolytope.cpp =================================================================== --- head/math/gfan/files/patch-src_app__fiberpolytope.cpp (nonexistent) +++ head/math/gfan/files/patch-src_app__fiberpolytope.cpp (revision 556996) @@ -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 "<dimension()<dimension()<dimension()<dimension()<dimension()<dimension()<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"<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++) + // { Property changes on: head/math/gfan/files/patch-src_bergman.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_breadthfirstsearch.cpp =================================================================== --- head/math/gfan/files/patch-src_breadthfirstsearch.cpp (nonexistent) +++ head/math/gfan/files/patch-src_breadthfirstsearch.cpp (revision 556996) @@ -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"); + } + } + } Property changes on: head/math/gfan/files/patch-src_breadthfirstsearch.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_buchberger.cpp =================================================================== --- head/math/gfan/files/patch-src_buchberger.cpp (nonexistent) +++ head/math/gfan/files/patch-src_buchberger.cpp (revision 556996) @@ -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: "<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)) + { Property changes on: head/math/gfan/files/patch-src_buchberger.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_codimoneconnectedness.cpp =================================================================== --- head/math/gfan/files/patch-src_codimoneconnectedness.cpp (nonexistent) +++ head/math/gfan/files/patch-src_codimoneconnectedness.cpp (revision 556996) @@ -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 diameterprintPolygon(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; + } Property changes on: head/math/gfan/files/patch-src_ep__xfig.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_field__rationals.cpp =================================================================== --- head/math/gfan/files/patch-src_field__rationals.cpp (nonexistent) +++ head/math/gfan/files/patch-src_field__rationals.cpp (revision 556996) @@ -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; Property changes on: head/math/gfan/files/patch-src_field__rationals.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_gfanlib__polyhedralfan.cpp =================================================================== --- head/math/gfan/files/patch-src_gfanlib__polyhedralfan.cpp (nonexistent) +++ head/math/gfan/files/patch-src_gfanlib__polyhedralfan.cpp (revision 556996) @@ -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"<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 "<count(i)) + { +- log2 cerr<<"Expanding symmetries of cone"<::const_iterator j=cones[i].begin();j!=cones[i].end();j++) Property changes on: head/math/gfan/files/patch-src_gfanlib__polyhedralfan.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_gfanlib__symmetriccomplex.cpp =================================================================== --- head/math/gfan/files/patch-src_gfanlib__symmetriccomplex.cpp (nonexistent) +++ head/math/gfan/files/patch-src_gfanlib__symmetriccomplex.cpp (revision 556996) @@ -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); + } Property changes on: head/math/gfan/files/patch-src_gfanlib__symmetriccomplex.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_gfanlib__zfan.cpp =================================================================== --- head/math/gfan/files/patch-src_gfanlib__zfan.cpp (nonexistent) +++ head/math/gfan/files/patch-src_gfanlib__zfan.cpp (revision 556996) @@ -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 "<count(i)) + { +-// log2 cerr<<"Expanding symmetries of cone"<::const_iterator j=cones[i].begin();j!=cones[i].end();j++) Property changes on: head/math/gfan/files/patch-src_gfanlib__zfan.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_halfopencone.cpp =================================================================== --- head/math/gfan/files/patch-src_halfopencone.cpp (nonexistent) +++ head/math/gfan/files/patch-src_halfopencone.cpp (revision 556996) @@ -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"< 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"< 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"< + 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(); + Property changes on: head/math/gfan/files/patch-src_halfopencone.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_linalg.cpp =================================================================== --- head/math/gfan/files/patch-src_linalg.cpp (nonexistent) +++ head/math/gfan/files/patch-src_linalg.cpp (revision 556996) @@ -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); Property changes on: head/math/gfan/files/patch-src_linalg.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_log.h =================================================================== --- head/math/gfan/files/patch-src_log.h (nonexistent) +++ head/math/gfan/files/patch-src_log.h (revision 556996) @@ -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 Property changes on: head/math/gfan/files/patch-src_log.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_lp__soplexcdd.cpp =================================================================== --- head/math/gfan/files/patch-src_lp__soplexcdd.cpp (nonexistent) +++ head/math/gfan/files/patch-src_lp__soplexcdd.cpp (revision 556996) @@ -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;idimension()); ++ 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 "<count(i)) + { +- log2 cerr<<"Expanding symmetries of cone"<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++) Property changes on: head/math/gfan/files/patch-src_polyhedralfan.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_reversesearch.cpp =================================================================== --- head/math/gfan/files/patch-src_reversesearch.cpp (nonexistent) +++ head/math/gfan/files/patch-src_reversesearch.cpp (revision 556996) @@ -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; + } + Property changes on: head/math/gfan/files/patch-src_reversesearch.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_singular.cpp =================================================================== --- head/math/gfan/files/patch-src_singular.cpp (nonexistent) +++ head/math/gfan/files/patch-src_singular.cpp (revision 556996) @@ -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"<dimension; Property changes on: head/math/gfan/files/patch-src_symmetriccomplex.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_symmetry.cpp =================================================================== --- head/math/gfan/files/patch-src_symmetry.cpp (nonexistent) +++ head/math/gfan/files/patch-src_symmetry.cpp (revision 556996) @@ -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) Property changes on: head/math/gfan/files/patch-src_symmetry.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_traverser__stableintersection.cpp =================================================================== --- head/math/gfan/files/patch-src_traverser__stableintersection.cpp (nonexistent) +++ head/math/gfan/files/patch-src_traverser__stableintersection.cpp (revision 556996) @@ -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:"<0 || n==0); + TimerScope ts(&iterativeTropicalBasisTimer); + PolyhedralFan f(n); +@@ -148,7 +148,7 @@ restart: + + if(containsNoMonomialCache.count(relativeInteriorPoint)>0) + { +- log2 fprintf(Stderr,"Weight vector found in cache.... contains no monomial.\n"); ++ gfan_log2 fprintf(Stderr,"Weight vector found in cache.... contains no monomial.\n"); + } + else + { +@@ -163,9 +163,9 @@ restart: + } + }*/ + WeightReverseLexicographicTermOrder t(relativeInteriorPoint); +- log2 fprintf(Stderr,"Computing Gr\"obner basis with respect to:"); +- log2 AsciiPrinter(Stderr).printVector(relativeInteriorPoint); +- log2 fprintf(Stderr,"\n"); ++ gfan_log2 fprintf(Stderr,"Computing Gr\"obner basis with respect to:"); ++ gfan_log2 AsciiPrinter(Stderr).printVector(relativeInteriorPoint); ++ gfan_log2 fprintf(Stderr,"\n"); + PolynomialSet h2=originalG;//g;//<------------------- Using the original set here speeds up things a lot in the starting cone via stable intersections algorithm + // debug<<"g"<dimension()<=1+homog) + //if(!containsMonomial(wall) && i->dimension()<=1+homog)//line for testing perturbation code + { +- log2 fprintf(Stderr,"Initial ideal contains no monomial... caching weight vector.\n"); ++ gfan_log2 fprintf(Stderr,"Initial ideal contains no monomial... caching weight vector.\n"); + containsNoMonomialCache.insert(relativeInteriorPoint); + } + else +@@ -227,10 +227,10 @@ restart: + dual.canonicalize(); + IntegerVectorList basis=dual.getEquations(); + PolynomialSet witnessLiftBasis=h2;//basis with respect to relativeInteriorPoint +- log2 debug<<"basis"<conesEnd())break; + } + +- log2 debug<<"TropicalBasis end\n"; +- log2 cerr <<"RETURNING"; ++ gfan_log2 debug<<"TropicalBasis end\n"; ++ gfan_log2 cerr <<"RETURNING"; + return g; + } + Property changes on: head/math/gfan/files/patch-src_tropicalbasis.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_tropicalcurve.cpp =================================================================== --- head/math/gfan/files/patch-src_tropicalcurve.cpp (nonexistent) +++ head/math/gfan/files/patch-src_tropicalcurve.cpp (revision 556996) @@ -0,0 +1,188 @@ +--- src/tropicalcurve.cpp.orig 2017-06-20 14:47:37 UTC ++++ src/tropicalcurve.cpp +@@ -48,7 +48,7 @@ IntegerVectorList tropicalCurve(PolynomialSet const &I + int stat_isInTropicalVariety=0; + int stat_finiteLiftEasy=0; + int stat_finiteLiftHard=0; +- log2 debug<<"tropicalCurve on:"< chosenVariables; + for(int j=0;jsubvector(1,n).isZero()) + candidates.push_back(*j); + +- log2 debug<<"Number of candidates "<<(int)candidates.size()<<"\n"; ++ gfan_log2 debug<<"Number of candidates "<<(int)candidates.size()<<"\n"; + + if(candidates.size()==1) + { +@@ -303,8 +303,8 @@ IntegerVectorList tropicalCurve(PolynomialSet const &I + + + +- log2 debug<<"Checking complicated list:\n"; +- log2 debug<supportAsZeroOneVector(); + +- log2 debug<<"Support sum:"<subvector(0,i),IntegerVector(1)),k->subvector(i,n-1))+s2*(*l)[0]*IntegerVector::standardVector(n,i); + preCheck.push_back(v); + } +- log2 debug<<"Combined:\n"< const &facetStack, list const &ridgeStack) Property changes on: head/math/gfan/files/patch-src_tropicaltraverse.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/files/patch-src_wallideal.cpp =================================================================== --- head/math/gfan/files/patch-src_wallideal.cpp (nonexistent) +++ head/math/gfan/files/patch-src_wallideal.cpp (revision 556996) @@ -0,0 +1,11 @@ +--- src/wallideal.cpp.orig 2017-06-20 14:47:37 UTC ++++ src/wallideal.cpp +@@ -1055,7 +1055,7 @@ IntegerVectorList fastNormals(IntegerVectorList const + // log0 fprintf(Stderr,"Number of inequalities:%i\n",normals.size()); + + // log0 fprintf(Stderr,"G"); +- //log2 cerr << "Fast normals end" << endl; ++ //gfan_log2 cerr << "Fast normals end" << endl; + return normals; + } + Property changes on: head/math/gfan/files/patch-src_wallideal.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/math/gfan/pkg-descr =================================================================== --- head/math/gfan/pkg-descr (revision 556995) +++ head/math/gfan/pkg-descr (revision 556996) @@ -1,17 +1,4 @@ Gfan is a software package for computing Groebner fans and tropical -varieties. These are polyhedral fans associated to polynomial ideals. -The maximal cones of a Groebner fan are in bijection with the marked -reduced Groebner bases of its defining ideal. The software computes -all marked reduced Groebner bases of an ideal. Their union is a -universal Greobner basis. The tropical variety of a polynomial ideal -is a certain subcomplex of the Groebner fan. Gfan contains algorithms -for computing this complex for general ideals and specialized -algorithms for tropical curves, tropical hypersurfaces and tropical -varieties of prime ideals. In addition to the above core functions -the package contains many tools which are useful in the study of -Groebner bases, initial ideals and tropical geometry. +varieties. -This port provides gfan together with some handy symlinks. The static -library libgfan.a is provided by the port math/gfanlib. - -WWW: http://home.math.au.dk/jensen/software/gfan/gfan.html +WWW: https://users-math.au.dk/jensen/software/gfan/gfan.html Index: head/math/gfan/pkg-plist =================================================================== --- head/math/gfan/pkg-plist (revision 556995) +++ head/math/gfan/pkg-plist (revision 556996) @@ -1,92 +1,92 @@ +%%PORTDOCS%%%%DOCSDIR%%/gfan.eps +%%PORTDOCS%%%%DOCSDIR%%/manual.dvi +%%PORTDOCS%%%%DOCSDIR%%/nonconst.eps +%%PORTDOCS%%%%DOCSDIR%%/polyformat.eps +%%PORTDOCS%%%%DOCSDIR%%/staircase.eps +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2x2of2x3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2x2of2x4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2x2of3x3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2x2of4x4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of3x4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of3x5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of3x5.cone +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of4x4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of4x4sym.cone +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/4x4of4x5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/4x4of5x5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/6x6-subPfaffians +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commat2x2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commat2x2.cone +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cyclic4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cyclic5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examplePaper +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann2_5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann2_5.cone +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann2_6 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann2_6.cone +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann3_6 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann3_6.cone +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hankel3x3of4x4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hankel3x3of4x4.cone +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hankel3x3of4x5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hankel3x3of4x5.cone +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linhyper5_2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linhyper5_2.cone +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pablo +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sturmfels3.9 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/symmetryTest bin/gfan bin/gfan_bases bin/gfan_buchberger bin/gfan_combinerays bin/gfan_doesidealcontain bin/gfan_fancommonrefinement bin/gfan_fanhomology bin/gfan_fanisbalanced bin/gfan_fanlink bin/gfan_fanproduct bin/gfan_fansubfan bin/gfan_genericlinearchange bin/gfan_groebnercone bin/gfan_groebnerfan bin/gfan_homogeneityspace bin/gfan_homogenize bin/gfan_initialforms bin/gfan_interactive bin/gfan_ismarkedgroebnerbasis bin/gfan_krulldimension bin/gfan_latticeideal bin/gfan_leadingterms bin/gfan_list bin/gfan_markpolynomialset bin/gfan_minkowskisum bin/gfan_minors bin/gfan_mixedvolume bin/gfan_overintegers bin/gfan_padic bin/gfan_polynomialsetunion bin/gfan_render bin/gfan_renderstaircase bin/gfan_resultantfan bin/gfan_saturation bin/gfan_secondaryfan bin/gfan_stats bin/gfan_substitute bin/gfan_symmetries bin/gfan_tolatex bin/gfan_topolyhedralfan bin/gfan_tropicalbasis bin/gfan_tropicalbruteforce bin/gfan_tropicalcurve bin/gfan_tropicalevaluation bin/gfan_tropicalfunction bin/gfan_tropicalhypersurface bin/gfan_tropicalintersection bin/gfan_tropicallifting bin/gfan_tropicallinearspace bin/gfan_tropicalmultiplicity bin/gfan_tropicalrank bin/gfan_tropicalstartingcone bin/gfan_tropicaltraverse bin/gfan_tropicalweildivisor bin/gfan_version -%%PORTDOCS%%%%DOCSDIR%%/manual.dvi -%%PORTDOCS%%%%DOCSDIR%%/gfan.eps -%%PORTDOCS%%%%DOCSDIR%%/nonconst.eps -%%PORTDOCS%%%%DOCSDIR%%/polyformat.eps -%%PORTDOCS%%%%DOCSDIR%%/staircase.eps -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2x2of2x3 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2x2of2x4 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2x2of3x3 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2x2of4x4 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of3x4 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of3x5 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of3x5.cone -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of4x4 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3x3of4x4sym.cone -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/4x4of4x5 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/4x4of5x5 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/6x6-subPfaffians -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commat2x2 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commat2x2.cone -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cyclic4 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cyclic5 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examplePaper -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann2_5 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann2_5.cone -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann2_6 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann2_6.cone -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann3_6 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grassmann3_6.cone -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hankel3x3of4x4 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hankel3x3of4x4.cone -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hankel3x3of4x5 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hankel3x3of4x5.cone -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linhyper5_2 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linhyper5_2.cone -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pablo -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sturmfels3.9 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/symmetryTest