diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-mathematics/gfan/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'sci-mathematics/gfan/files')
| -rw-r--r-- | sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch | 12 | ||||
| -rw-r--r-- | sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch | 70 |
2 files changed, 82 insertions, 0 deletions
diff --git a/sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch b/sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch new file mode 100644 index 000000000000..239540884011 --- /dev/null +++ b/sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch @@ -0,0 +1,12 @@ +diff -U 3 -dHrN gfan0.5/app_minkowski.cpp gfan0.5-new/app_minkowski.cpp +--- gfan0.5/app_minkowski.cpp 2011-01-23 12:21:47.000000000 -0500 ++++ gfan0.5-new/app_minkowski.cpp 2012-06-29 15:23:48.604280985 -0400 +@@ -160,7 +160,7 @@ + //log0 fprintf(Stderr,"4"); + f.insert(c); + //log0 fprintf(Stderr,"5\n"); +- static int i; ++ // static int i; + //log0 fprintf(Stderr,"inserted:%i\n",++i); + } + log1 fprintf(Stderr,"Resolving symmetries.\n"); diff --git a/sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch b/sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch new file mode 100644 index 000000000000..8479557b61bb --- /dev/null +++ b/sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch @@ -0,0 +1,70 @@ +--- a/app_fiberpolytope.cpp ++++ b/app_fiberpolytope.cpp +@@ -63,7 +63,7 @@ + + /* If the vector configuration B does not have full rank then + change coordinates. */ +- if(rank(B)!=B.getHeight()) ++ if(rank_(B)!=B.getHeight()) + { + FieldMatrix M=integerMatrixToFieldMatrix(B,Q); + M.reduce(false,true);//force integer operations - preserving volume +@@ -83,7 +83,7 @@ + log1 debug<<"Done computing restricting cone\n"; + + debug<<B.getRows(); +- debug<<int(rank(B)); ++ debug<<int(rank_(B)); + + Triangulation2 t(B); + log1 debug<<"Computing initial triangulation\n"; +@@ -143,7 +143,7 @@ + */ + /* If the vector configuration A does not have full rank then + change coordinates. */ +-/* if(rank(A)!=A.getHeight()) ++/* if(rank_(A)!=A.getHeight()) + { + FieldMatrix M=integerMatrixToFieldMatrix(A,Q); + M.reduce(false,true);//force integer operations - preserving volume +--- a/app_secondaryfan.cpp ++++ b/app_secondaryfan.cpp +@@ -307,7 +307,7 @@ + + if(scaleOption.getValue()) + { +- if(rank(A)!=A.getHeight()) ++ if(rank_(A)!=A.getHeight()) + { + cerr << "The vector configuration must have full rank in order to use the scale option.\n"; + assert(0); +@@ -342,7 +342,7 @@ + + /* If the vector configuration A does not have full rank then + change coordinates. */ +- if(rank(A)!=A.getHeight()) ++ if(rank_(A)!=A.getHeight()) + { + FieldMatrix M=integerMatrixToFieldMatrix(A,Q); + M.reduce(false,true);//force integer operations - preserving volume +--- a/matrix.cpp ++++ b/matrix.cpp +@@ -61,7 +61,7 @@ + + #include "linalg.h" + +-int rank(IntegerMatrix const &m) ++int rank_(IntegerMatrix const &m) + { + return integerMatrixToFieldMatrix(m,Q).rank(); + } +--- a/matrix.h ++++ b/matrix.h +@@ -147,6 +147,6 @@ + + FloatMatrix integerToFloatMatrix(IntegerMatrix const &m); + IntegerVector flattenMatrix(IntegerMatrix const &m); +-int rank(IntegerMatrix const &m); ++int rank_(IntegerMatrix const &m); + + #endif |