mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 22:30:38 -04:00
ecbb96a533
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)
56 lines
2.3 KiB
C++
56 lines
2.3 KiB
C++
--- src/tropicaltraverse.cpp.orig 2017-06-20 14:47:37 UTC
|
|
+++ src/tropicaltraverse.cpp
|
|
@@ -199,7 +199,7 @@ static void printMarkedTermIdeal(PolynomialSet const &
|
|
static void changeCone(PolynomialSet &coneGroebnerBasis, PolynomialSet &idealGroebnerBasis, IntegerVector const &ridgeVector, IntegerVector const &rayVector)
|
|
{
|
|
assert(idealGroebnerBasis.containsInClosedGroebnerCone(ridgeVector));
|
|
- log2 cerr<<endl<<"Changing cone"<<endl;
|
|
+ gfan_log2 cerr<<endl<<"Changing cone"<<endl;
|
|
|
|
assert(!containsMonomial(coneGroebnerBasis));
|
|
|
|
@@ -213,7 +213,7 @@ static void changeCone(PolynomialSet &coneGroebnerBasi
|
|
WeightReverseLexicographicTermOrder T(rayVector);
|
|
|
|
// P<<ridgeIdeal;
|
|
- log2 cerr<<"Computing initial Groebner basis"<<endl;
|
|
+ gfan_log2 cerr<<"Computing initial Groebner basis"<<endl;
|
|
// buchberger(&ridgeIdeal,T);
|
|
|
|
ridgeIdeal=GE_groebnerBasis(ridgeIdeal,T,true,false);//Set to true?
|
|
@@ -224,7 +224,7 @@ static void changeCone(PolynomialSet &coneGroebnerBasi
|
|
// WeightTermOrder termOrder(termorderWeight(ridgeIdeal));
|
|
WeightTermOrder termOrder(termorderWeight(ridgeIdealOld));
|
|
|
|
- log2 cerr<<"Lifting"<<endl;
|
|
+ gfan_log2 cerr<<"Lifting"<<endl;
|
|
PolynomialSet temp=ridgeIdealOld;
|
|
temp.markAndScale(T);
|
|
temp=temp.markedTermIdeal();
|
|
@@ -244,7 +244,7 @@ static void changeCone(PolynomialSet &coneGroebnerBasi
|
|
}
|
|
assert(g2.isMarked());
|
|
//printMarkedTermIdeal(g2,"g2");
|
|
- log2 cerr<<"Autoreducing"<<endl;
|
|
+ gfan_log2 cerr<<"Autoreducing"<<endl;
|
|
|
|
// autoReduce(&g2,LexicographicTermOrder());
|
|
//PolynomialSet g2Old=g2;
|
|
@@ -260,7 +260,7 @@ static void changeCone(PolynomialSet &coneGroebnerBasi
|
|
assert(idealGroebnerBasis.size()==oldSize);
|
|
// idealGroebnerBasis=g2;
|
|
assert(!containsMonomial(coneGroebnerBasis));
|
|
- log2 cerr<<"Done changing cone"<<endl<<endl;
|
|
+ gfan_log2 cerr<<"Done changing cone"<<endl<<endl;
|
|
|
|
// P<<coneGroebnerBasis;
|
|
// P<<idealGroebnerBasis;
|
|
@@ -279,7 +279,7 @@ static void changeCone(PolynomialSet &coneGroebnerBasi
|
|
P<<coneGroebnerBasis;
|
|
}*/
|
|
|
|
- log2 cerr << "Number of terms in new basis: "<< g2.totalNumberOfTerms()<<endl;
|
|
+ gfan_log2 cerr << "Number of terms in new basis: "<< g2.totalNumberOfTerms()<<endl;
|
|
}
|
|
|
|
void printStack(list<pathStepFacet> const &facetStack, list<pathStepRidge> const &ridgeStack)
|