From c1dd952eb5a90112c51b9c1bfc5180aa73f4b573e4fb89687c5f884c7708097c Mon Sep 17 00:00:00 2001 From: Detlef Steuer Date: Tue, 27 Sep 2011 14:28:37 +0000 Subject: [PATCH] Accepting request 85112 from home:jengelh:science Used by the sagemath stack OBS-URL: https://build.opensuse.org/request/show/85112 OBS-URL: https://build.opensuse.org/package/show/science/gfan?expand=0&rev=1 --- .gitattributes | 23 ++++ .gitignore | 1 + gfan-automake.diff | 270 ++++++++++++++++++++++++++++++++++++ gfan-format.diff | 335 +++++++++++++++++++++++++++++++++++++++++++++ gfan-returns.diff | 67 +++++++++ gfan.changes | 4 + gfan.spec | 93 +++++++++++++ gfan0.5.tar.xz | 3 + 8 files changed, 796 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 gfan-automake.diff create mode 100644 gfan-format.diff create mode 100644 gfan-returns.diff create mode 100644 gfan.changes create mode 100644 gfan.spec create mode 100644 gfan0.5.tar.xz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/gfan-automake.diff b/gfan-automake.diff new file mode 100644 index 0000000..ded15d4 --- /dev/null +++ b/gfan-automake.diff @@ -0,0 +1,270 @@ +From: Jan Engelhardt +Date: 2011-09-27 03:33:14.793222451 +0200 +Upstream: dead? + +Use much simpler Makefiles. + +--- + Makefile.am | 241 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 8 + + 2 files changed, 249 insertions(+) + +Index: gfan0.5/Makefile.am +=================================================================== +--- /dev/null ++++ gfan0.5/Makefile.am +@@ -0,0 +1,241 @@ ++# -*- Makefile -*- ++ ++AM_CPPFLAGS = -DGMPRATIONAL ++AM_CXXFLAGS = -Wuninitialized ++ ++lib_LTLIBRARIES = libgfan.la ++ ++libgfan_la_LIBADD = -lcddgmp ++libgfan_la_LDFLAGS = -release ${PACKAGE_VERSION} ++libgfan_la_SOURCES = \ ++ gfanlib_polyhedralfan.cpp \ ++ gfanlib_polymakefile.cpp \ ++ gfanlib_symmetriccomplex.cpp \ ++ gfanlib_symmetry.cpp \ ++ gfanlib_zcone.cpp \ ++ gfanlib_zfan.cpp ++ ++bin_PROGRAMS = gfan ++ ++app_sources = \ ++ app_buchberger.cpp \ ++ app_combinerays.cpp \ ++ app_commonrefinement.cpp \ ++ app_composepermutations.cpp \ ++ app_doesidealcontain.cpp \ ++ app_evaluate.cpp \ ++ app_exponentlattice.cpp \ ++ app_facets.cpp \ ++ app_fancoarsening.cpp \ ++ app_fancones.cpp \ ++ app_fanhomology.cpp \ ++ app_fansubfan.cpp \ ++ app_fiberpolytope.cpp \ ++ app_genericlinearchange.cpp \ ++ app_groebnercone.cpp \ ++ app_groebnerfan.cpp \ ++ app_homogeneityspace.cpp \ ++ app_homogenize.cpp \ ++ app_idealintersection.cpp \ ++ app_idealproduct.cpp \ ++ app_initialdeterminant.cpp \ ++ app_initialforms.cpp \ ++ app_integergb.cpp \ ++ app_interactive.cpp \ ++ app_intsinpolytope.cpp\ ++ app_isconnected.cpp \ ++ app_isgroebnerbasis.cpp \ ++ app_ismarkedgroebnerbasis.cpp \ ++ app_issmooth.cpp \ ++ app_krulldimension.cpp \ ++ app_lattice.cpp \ ++ app_latticeideal.cpp \ ++ app_leadingterms.cpp \ ++ app_librarytest.cpp \ ++ app_link.cpp \ ++ app_lll.cpp \ ++ app_lpsolve.cpp \ ++ app_main.cpp \ ++ app_markpolynomialset.cpp \ ++ app_matrixproduct.cpp \ ++ app_minimalassociatedprimes.cpp \ ++ app_minkowski.cpp \ ++ app_minors.cpp \ ++ app_mixedvolume.cpp \ ++ app_multiplymatrix.cpp \ ++ app_nbody.cpp \ ++ app_normalfancleanup.cpp \ ++ app_padic.cpp \ ++ app_pointconfiguration.cpp \ ++ app_polynomialsetunion.cpp \ ++ app_product.cpp \ ++ app_realroots.cpp \ ++ app_regularsubdivision.cpp \ ++ app_render.cpp \ ++ app_renderstaircase.cpp \ ++ app_representatives.cpp \ ++ app_saturation.cpp \ ++ app_scarfcomplex.cpp \ ++ app_scarfisgeneric.cpp \ ++ app_scarfvisualize.cpp \ ++ app_secondaryfan.cpp \ ++ app_smalessixth.cpp \ ++ app_smalessixth2.cpp \ ++ app_spolynomial.cpp \ ++ app_stats.cpp \ ++ app_sturmsequence.cpp \ ++ app_substitute.cpp \ ++ app_supportindices.cpp \ ++ app_symmetries.cpp \ ++ app_test.cpp \ ++ app_tolatex.cpp \ ++ app_topolyhedralfan.cpp \ ++ app_transposematrix.cpp \ ++ app_traversetropicalintersection.cpp \ ++ app_triangulate.cpp \ ++ app_tropicalbasis.cpp \ ++ app_tropicalbruteforce.cpp \ ++ app_tropicalevaluation.cpp \ ++ app_tropicalfunction.cpp \ ++ app_tropicalhypersurface.cpp \ ++ app_tropicalimage.cpp \ ++ app_tropicalintersection.cpp \ ++ app_tropicallifting.cpp \ ++ app_tropicallinearspace.cpp \ ++ app_tropicalmultiplicity.cpp \ ++ app_tropicalrank.cpp \ ++ app_tropicalstartingcone.cpp \ ++ app_tropicaltraverse.cpp \ ++ app_tropicalweildivisor.cpp \ ++ app_volume.cpp \ ++ app_walk.cpp \ ++ app_weightvector.cpp ++ ++app_delete_sources = \ ++ app_add.cpp \ ++ app_berndssuggestion.cpp \ ++ app_grassmanndata2.cpp \ ++ app_grassmanndata3.cpp \ ++ app_construction.cpp \ ++ app_checkridges.cpp \ ++ app_edwinsconjecture.cpp \ ++ app_fvector.cpp \ ++ app_grassmanndata.cpp \ ++ app_groupfacetbinomials.cpp \ ++ app_istriangulation.cpp \ ++ app_latticetest.cpp \ ++ app_markpolynomialset.cpp \ ++ app_moeckel.cpp \ ++ app_polytopetopolynomial.cpp \ ++ app_rendernewtonpolytope.cpp \ ++ app_tropical.cpp \ ++ app_xfigconstruction.cpp \ ++ app_liststandardmonomials.cpp ++# needs to be fixed so that it compiles with gcc version 2.96 (legolas.imf.au.dk) ++#app_delete_sources += app_isrefinement.cpp ++ ++cats_sources = \ ++ binomial.cpp \ ++ codimoneconnectedness.cpp \ ++ continuedfractions.cpp \ ++ determinant.cpp \ ++ determinantpoly.cpp \ ++ field_rationalfunctions.cpp \ ++ field_rationalfunctions2.cpp \ ++ fieldlp.cpp \ ++ ge_gfan.cpp \ ++ graph.cpp \ ++ groebnerengine.cpp \ ++ halfopencone.cpp \ ++ integergb.cpp \ ++ intsinpolytope.cpp\ ++ lattice.cpp \ ++ latticeideal.cpp \ ++ linalg.cpp \ ++ linalgfloat.cpp \ ++ lll.cpp \ ++ log.cpp \ ++ matrix.cpp \ ++ minkowskidual.cpp \ ++ minors.cpp \ ++ mixedvolume.cpp \ ++ multiplicity.cpp \ ++ nbody.cpp \ ++ padic.cpp \ ++ polymakefile.cpp \ ++ polynomialring.cpp \ ++ primarydecomposition.cpp \ ++ regularsubdivision.cpp \ ++ restrictedautoreduction.cpp \ ++ saturation.cpp \ ++ scarf.cpp \ ++ substitute.cpp \ ++ symmetriccomplex.cpp \ ++ symmetrictraversal.cpp \ ++ traverser_groebnerfan.cpp \ ++ traverser_secondaryfan.cpp \ ++ traverser_sphere.cpp \ ++ traverser_stableintersection.cpp \ ++ traverser_tropical.cpp \ ++ triangulation.cpp \ ++ tropical_weildivisor.cpp \ ++ tropicalbasis.cpp \ ++ tropicaldeterminant.cpp \ ++ tropicalmap.cpp \ ++ tropicaltraverse.cpp \ ++ xfig.cpp ++#cats_sources += restrictedgfan.cpp ++ ++gcats_sources = \ ++ application.cpp \ ++ bergman.cpp \ ++ breadthfirstsearch.cpp \ ++ buchberger.cpp \ ++ dimension.cpp \ ++ division.cpp \ ++ enumeration.cpp \ ++ ep_standard.cpp \ ++ ep_xfig.cpp \ ++ field.cpp \ ++ field_rationals.cpp \ ++ field_zmodpz.cpp \ ++ genericwalk.cpp \ ++ gfanapplication.cpp \ ++ gmpallocator.cpp \ ++ lp.cpp \ ++ lp_cdd.cpp \ ++ minkowskisum.cpp \ ++ monomial.cpp \ ++ newtonpolytope.cpp \ ++ parser.cpp \ ++ polyhedralcone.cpp \ ++ polyhedralfan.cpp \ ++ polynomial.cpp \ ++ printer.cpp \ ++ renderer.cpp \ ++ reversesearch.cpp \ ++ subspace.cpp \ ++ symmetry.cpp \ ++ term.cpp \ ++ termorder.cpp \ ++ timer.cpp \ ++ tropical.cpp \ ++ tropical2.cpp \ ++ vektor.cpp \ ++ wallideal.cpp ++ ++gfan_LDADD = libgfan.la -lgmp -lcddgmp ++gfan_SOURCES = ${gcats_sources} ${cats_sources} ${app_sources} ++ ++include_HEADERS = \ ++ gfanlib.h \ ++ gfanlib_matrix.h \ ++ gfanlib_polyhedralfan.h \ ++ gfanlib_polymakefile.h \ ++ gfanlib_q.h \ ++ gfanlib_symmetriccomplex.h \ ++ gfanlib_symmetry.h \ ++ gfanlib_vector.h \ ++ gfanlib_z.h \ ++ gfanlib_zcone.h \ ++ gfanlib_zfan.h +Index: gfan0.5/configure.ac +=================================================================== +--- /dev/null ++++ gfan0.5/configure.ac +@@ -0,0 +1,8 @@ ++AC_INIT([gfan], [0.5]) ++AM_INIT_AUTOMAKE([-Wall foreign]) ++AC_PROG_INSTALL ++AC_PROG_CXX ++AC_DISABLE_STATIC ++LT_INIT ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT diff --git a/gfan-format.diff b/gfan-format.diff new file mode 100644 index 0000000..0161e13 --- /dev/null +++ b/gfan-format.diff @@ -0,0 +1,335 @@ +From: Jan Engelhardt +Date: 2011-09-27 04:06:42.735354010 +0200 +Upstream: dead? + +%i wants an int, not a size_type. Use proper %z specifier. + +--- + app_intsinpolytope.cpp | 4 ++-- + app_isgroebnerbasis.cpp | 2 +- + app_normalfancleanup.cpp | 2 +- + app_secondaryfan.cpp | 6 +++--- + app_test.cpp | 2 +- + app_tropicaltraverse.cpp | 2 +- + bergman.cpp | 4 ++-- + buchberger.cpp | 4 ++-- + genericwalk.cpp | 2 +- + gmpallocator.cpp | 6 +++--- + halfopencone.cpp | 6 +++--- + lp_cdd.cpp | 4 ++-- + minkowskisum.cpp | 2 +- + polyhedralfan.cpp | 6 +++--- + symmetry.cpp | 2 +- + xfig.cpp | 2 +- + xfig.h | 2 +- + 17 files changed, 29 insertions(+), 29 deletions(-) + +Index: gfan0.5/app_intsinpolytope.cpp +=================================================================== +--- gfan0.5.orig/app_intsinpolytope.cpp ++++ gfan0.5/app_intsinpolytope.cpp +@@ -104,7 +104,7 @@ public: + } + } + +- fprintf(stderr,"Sets to test: %i\n",setsToCheck.size()); ++ fprintf(stderr,"Sets to test: %zu\n",setsToCheck.size()); + + set > ret; + for(set >::const_iterator i=setsToCheck.begin();i!=setsToCheck.end();i++) +@@ -118,7 +118,7 @@ public: + if(isPartOfAZBasis(l))ret.insert(*i); + } + +- fprintf(stderr,"Produced sets: %i\n",ret.size()); ++ fprintf(stderr,"Produced sets: %zu\n",ret.size()); + + return ret; + } +Index: gfan0.5/app_isgroebnerbasis.cpp +=================================================================== +--- gfan0.5.orig/app_isgroebnerbasis.cpp ++++ gfan0.5/app_isgroebnerbasis.cpp +@@ -47,7 +47,7 @@ public: + IntegerVectorListList sums; + IntegerVectorList polytope=minkowski(polytopes,&sums); + +- fprintf(Stderr,"Number of extreme vertices in Minkowski sum: %i\n",polytope.size()); ++ fprintf(Stderr,"Number of extreme vertices in Minkowski sum: %zu\n",polytope.size()); + + bool isGroebnerBasis=false; + int counter=0; +Index: gfan0.5/app_normalfancleanup.cpp +=================================================================== +--- gfan0.5.orig/app_normalfancleanup.cpp ++++ gfan0.5/app_normalfancleanup.cpp +@@ -71,7 +71,7 @@ public: + FILE *f=fopen("iteraTIon","w"); + if(f) + { +- fprintf(f,"%i:%i\n",a,l2.size()); ++ fprintf(f,"%i:%zu\n",a,l2.size()); + fclose(f); + } + } +Index: gfan0.5/app_secondaryfan.cpp +=================================================================== +--- gfan0.5.orig/app_secondaryfan.cpp ++++ gfan0.5/app_secondaryfan.cpp +@@ -142,7 +142,7 @@ public: + + while(1) + { +- fprintf(stdout,"Triangles in current triangulation:%i\n",a.bases.size()); ++ fprintf(stdout,"Triangles in current triangulation:%zu\n",a.bases.size()); + PolyhedralCone C=a.secondaryCone(); + + C.canonicalize(); +@@ -198,7 +198,7 @@ public: + + while(1) + { +- fprintf(stdout,"Triangles in current triangulation:%i\n",a.bases.size()); ++ fprintf(stdout,"Triangles in current triangulation:%zu\n",a.bases.size()); + // PolyhedralCone C=a.secondaryCone(); + + // C.canonicalize(); +@@ -214,7 +214,7 @@ public: + { + Triangulation2 b=a; + b.flipNew(-*i); +- fprintf(stdout,"Triangles in new triangulation:%i\n",b.bases.size()); ++ fprintf(stdout,"Triangles in new triangulation:%zu\n",b.bases.size()); + + if(b.bases.size()==abortAtSize) + { +Index: gfan0.5/app_test.cpp +=================================================================== +--- gfan0.5.orig/app_test.cpp ++++ gfan0.5/app_test.cpp +@@ -128,7 +128,7 @@ public: + + M[I]=minusOne*M[I]; + } +- fprintf(Stdout,"Extreme permutations (%i):\n",extreme.size()); ++ fprintf(Stdout,"Extreme permutations (%zu):\n",extreme.size()); + P.printVectorList(extreme); + } + +Index: gfan0.5/app_tropicaltraverse.cpp +=================================================================== +--- gfan0.5.orig/app_tropicaltraverse.cpp ++++ gfan0.5/app_tropicaltraverse.cpp +@@ -156,7 +156,7 @@ public: + BergmanFan f=bergman(coneGroebnerBasis,idealGroebnerBasis,&s); + f.computeMultiplicities(); + /* log1 fprintf(Stderr,"Is simplicial: %s\n",f.isSimplicial()?"true":"false");*/ +- log1 fprintf(Stderr,"Order of input symmetry group: %i\n",s.elements.size()); ++ log1 fprintf(Stderr,"Order of input symmetry group: %zu\n",s.elements.size()); + log1 fprintf(Stderr,"Number of maximal cones: %i\n",f.numberOfMaximalCones()); + log1 fprintf(Stderr,"Modulo the homogeneity space:\n"); + log1 AsciiPrinter(Stderr).printVectorList(hv); +Index: gfan0.5/bergman.cpp +=================================================================== +--- gfan0.5.orig/bergman.cpp ++++ gfan0.5/bergman.cpp +@@ -149,7 +149,7 @@ BergmanFan bergmanRay(PolynomialSet cons + if(0) + { + s=fullColoredIdeals(*g,false); +- fprintf(Stderr,"Full colored ideals computed, #=%i\n",s.size()); ++ fprintf(Stderr,"Full colored ideals computed, #=%zu\n",s.size()); + } + else + { +@@ -539,7 +539,7 @@ BergmanFan bergman(PolynomialSet const & + while(!active.empty()) + { + log1 fprintf(Stderr,"\n-------------------------------------\n"); +- log1 fprintf(Stderr,"Size of active set: %i, Completed: %i\n",active.size(),ret.cones.size()); ++ log1 fprintf(Stderr,"Size of active set: %i, Completed: %zu\n",active.size(),ret.cones.size()); + log1 fprintf(Stderr,"-------------------------------------\n"); + AsciiPrinter p(Stderr); + +Index: gfan0.5/buchberger.cpp +=================================================================== +--- gfan0.5.orig/buchberger.cpp ++++ gfan0.5/buchberger.cpp +@@ -540,7 +540,7 @@ void buchberger2(PolynomialSet *g, TermO + { + static int t; + t++; +- if((t&31)==0)fprintf(Stderr," spolys:%i\n",sPolynomials.size()); ++ if((t&31)==0)fprintf(Stderr," spolys:%zu\n",sPolynomials.size()); + } + + { +@@ -565,7 +565,7 @@ void buchberger2(PolynomialSet *g, TermO + { + static int t; + if(((++t)&=31)==0) +- fprintf(Stderr,"gsize:%i spolys:%i\n",g->size()+1,sPolynomials.size()); ++ fprintf(Stderr,"gsize:%zu spolys:%zu\n",g->size()+1,sPolynomials.size()); + } + PolynomialSet::iterator j=g->end();j--; + updatePairs(sPolynomials,g,&redundantOnes,j,indexj,truncationDegree,&grading); +Index: gfan0.5/genericwalk.cpp +=================================================================== +--- gfan0.5.orig/genericwalk.cpp ++++ gfan0.5/genericwalk.cpp +@@ -202,7 +202,7 @@ PolynomialSet genericWalkPerturbation(Po + g=newG; + + nflips++; +- fprintf(Stderr,"Flip %i, new size %i\n",nflips,g.size()); ++ fprintf(Stderr,"Flip %i, new size %zu\n",nflips,g.size()); + } + fprintf(Stderr,"Number of flips:%i\n",nflips); + +Index: gfan0.5/gmpallocator.cpp +=================================================================== +--- gfan0.5.orig/gmpallocator.cpp ++++ gfan0.5/gmpallocator.cpp +@@ -145,19 +145,19 @@ void myDeallocateFunction (void *ptr, si + //Debug + void *myAllocateFunctionD(size_t alloc_size) + { +- fprintf(stderr,"Allocating: %i bytes.\n",alloc_size); ++ fprintf(stderr,"Allocating: %zu bytes.\n",alloc_size); + return malloc(alloc_size); + } + + void *myReallocateFunctionD(void *ptr, size_t old_size, size_t new_size) + { +- fprintf(stderr,"Reallocating: %i --> %i bytes.\n",old_size,new_size); ++ fprintf(stderr,"Reallocating: %zu --> %zu bytes.\n",old_size,new_size); + return realloc(ptr,new_size); + } + + void myDeallocateFunctionD(void *ptr, size_t size) + { +- fprintf(stderr,"Freeing: %i bytes.\n",size); ++ fprintf(stderr,"Freeing: %zu bytes.\n",size); + return free(ptr); + } + +Index: gfan0.5/halfopencone.cpp +=================================================================== +--- gfan0.5.orig/halfopencone.cpp ++++ gfan0.5/halfopencone.cpp +@@ -555,14 +555,14 @@ HalfOpenConeList tropicalHyperSurfaceInt + { + HalfOpenConeList surface=tropicalHyperSurface(*i); + +- fprintf(Stderr,"Number of cones in current intersection:%i\n",intersection.size()); +- fprintf(Stderr,"Number of cones in next surface:%i\n",surface.size()); ++ fprintf(Stderr,"Number of cones in current intersection:%zu\n",intersection.size()); ++ fprintf(Stderr,"Number of cones in next surface:%zu\n",surface.size()); + + fprintf(Stderr,"A\n"); + intersection=refinement(intersection,surface); + fprintf(Stderr,"B\n"); + } +- fprintf(Stderr,"%i",intersection.size()); ++ fprintf(Stderr,"%zu",intersection.size()); + + return intersection; + } +Index: gfan0.5/lp_cdd.cpp +=================================================================== +--- gfan0.5.orig/lp_cdd.cpp ++++ gfan0.5/lp_cdd.cpp +@@ -1287,8 +1287,8 @@ void LpSolverCddGmp::removeRedundantRows + if(A->rowsize!=newLin.size()+newIn.size()) + { + fprintf(stderr,"A->rowsize: %i\n",(int)A->rowsize); +- fprintf(stderr,"newLin.size(): %i\n",newLin.size()); +- fprintf(stderr,"newIn.size(): %i\n",newIn.size()); ++ fprintf(stderr,"newLin.size(): %zu\n",newLin.size()); ++ fprintf(stderr,"newIn.size(): %zu\n",newIn.size()); + + dd_WriteMatrix(Stderr,A); + +Index: gfan0.5/minkowskisum.cpp +=================================================================== +--- gfan0.5.orig/minkowskisum.cpp ++++ gfan0.5/minkowskisum.cpp +@@ -27,7 +27,7 @@ IntegerVectorList minkowski(IntegerVecto + + assert(f); + { +- fprintf(f,"%i",polytopes.size()); ++ fprintf(f,"%zu",polytopes.size()); + TopcomPrinter p(f); + //AsciiPrinter p(f); + +Index: gfan0.5/polyhedralfan.cpp +=================================================================== +--- gfan0.5.orig/polyhedralfan.cpp ++++ gfan0.5/polyhedralfan.cpp +@@ -604,7 +604,7 @@ PolyhedralFan PolyhedralFan::rayComplexS + { + // log0 fprintf(Stderr,"rayComplexSymmetry - begin\n"); + PolyhedralFan ret(n); +- log1 fprintf(Stderr,"Computing rays of %i cones\n",cones.size()); ++ log1 fprintf(Stderr,"Computing rays of %zu cones\n",cones.size()); + for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++) + { + { +@@ -812,7 +812,7 @@ IntegerVectorList PolyhedralFan::getRays + SymmetryGroup localsym(n); + if(!sym)sym=&localsym; + set rays; +- log1 fprintf(Stderr,"Computing rays of %i cones\n",cones.size()); ++ log1 fprintf(Stderr,"Computing rays of %zu cones\n",cones.size()); + for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++) + { + { +@@ -1212,7 +1212,7 @@ void addFacesToSymmetricComplex(Symmetri + static int t; + if((t&1023)==0) + { +- fprintf(Stderr,"clist size:%i\n",clist.size()); ++ fprintf(Stderr,"clist size:%zu\n",clist.size()); + } + t++; + } +Index: gfan0.5/symmetry.cpp +=================================================================== +--- gfan0.5.orig/symmetry.cpp ++++ gfan0.5/symmetry.cpp +@@ -300,7 +300,7 @@ void SymmetryGroup::print(FILE *f) + l.push_back(*i); + } + P.printVectorList(l); +- fprintf(f,"Group order=%i\n",elements.size()); ++ fprintf(f,"Group order=%zu\n",elements.size()); + P.printString("Done printing SymmetryGroup.\n"); + } + +Index: gfan0.5/xfig.cpp +=================================================================== +--- gfan0.5.orig/xfig.cpp ++++ gfan0.5/xfig.cpp +@@ -103,7 +103,7 @@ void XFig::drawPolygon(const Polygon &ve + { + if(vertices.size()) + { +- fprintf(f,"2 3 0 1 0 %i 50 0 25 0.000 0 0 -1 0 0 %i\n ",7,vertices.size()+1); ++ fprintf(f,"2 3 0 1 0 %i 50 0 25 0.000 0 0 -1 0 0 %zu\n ",7,vertices.size()+1); + + for(Polygon::const_iterator i=vertices.begin();i!=vertices.end();i++) + kickPoint(*i,mode); +Index: gfan0.5/xfig.h +=================================================================== +--- gfan0.5.orig/xfig.h ++++ gfan0.5/xfig.h +@@ -52,7 +52,7 @@ class XFig + void endDrawLine() + { + assert(p.size()>0); +- fprintf(f," %i\n",p.size()); ++ fprintf(f," %zu\n",p.size()); + if(arrowOrigin) + fprintf(f,"\t 2 1 1.00 60.00 120.00\n"); + if(arrowTarget) diff --git a/gfan-returns.diff b/gfan-returns.diff new file mode 100644 index 0000000..ebb67cc --- /dev/null +++ b/gfan-returns.diff @@ -0,0 +1,67 @@ +From: Jan Engelhardt +Date: 2011-09-27 04:14:22.744016953 +0200 +Upstream: ? + +Fix things like: + +gfanlib_vector.h:291:7: warning: no return statement in function +returning non-void [-Wreturn-type] +app_tropicalintersection.cpp:45:2: warning: control reaches end +of non-void function [-Wreturn-type] + +--- + app_fancoarsening.cpp | 2 ++ + app_tropicalintersection.cpp | 1 + + gfanlib_vector.h | 1 + + gfanlib_zcone.cpp | 1 + + 4 files changed, 5 insertions(+) + +Index: gfan0.5/app_fancoarsening.cpp +=================================================================== +--- gfan0.5.orig/app_fancoarsening.cpp ++++ gfan0.5/app_fancoarsening.cpp +@@ -38,6 +38,8 @@ public: + + int i=0; + ++ /* unused function */ ++ return IntegerVectorList(); + } + + const char *helpText() +Index: gfan0.5/app_tropicalintersection.cpp +=================================================================== +--- gfan0.5.orig/app_tropicalintersection.cpp ++++ gfan0.5/app_tropicalintersection.cpp +@@ -42,6 +42,7 @@ public: + AsciiPrinter(Stdout)<<"The following vector is in intersection, but initial ideal contains a monomial:\n"<