Package: gfan
Severity: minor
Tags: patch
Followup-For: Bug #755308
User: [email protected]
Usertags: clang-ftbfs
Hi,
Please see new patch in the attach. First version of the patch has been created
in the wrong way.
Thanks,
Alexander
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- ./gfanlib_polyhedralfan.h 2013-01-17 02:56:44.000000000 +0400
+++ ../gfan-0.5+dfsg-my/./gfanlib_polyhedralfan.h 2014-07-30 01:18:03.107800271 +0400
@@ -24,6 +24,8 @@
typedef std::map<int,IntVectorList> IncidenceList;
+class PolyhedralFan;
+PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
/** A PolyhedralFan is simply a collection of canonicalized PolyhedralCones.
* It contains no combinatorial information in the sense of a polyhedral complex.
@@ -52,7 +54,7 @@
int getAmbientDimension()const;
int getMaxDimension()const;
int getMinDimension()const;
- friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
+ friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension, bool allowASingleConeOfCutOffDimension);
ZMatrix getRays(int dim=1);//This can be called for other dimensions than 1. The term "Rays" still makes sense modulo the common linearity space
ZMatrix getRelativeInteriorPoints();
void insert(ZCone const &c);
--- ./polyhedralfan.h 2013-01-17 02:56:44.000000000 +0400
+++ ../gfan-0.5+dfsg-my/./polyhedralfan.h 2014-07-30 01:15:14.143339210 +0400
@@ -31,6 +31,9 @@
};
+class PolyhedralFan;
+PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
+
/** A PolyhedralFan is simply a collection of canonicalized PolyhedralCones.
* It contains no combinatorial information in the sense of a polyhedral complex.
* A cone being present in the PolyhedralFan corresponds to the cone and all its facets being present
@@ -74,7 +77,7 @@
int getAmbientDimension()const;
int getMaxDimension()const;
int getMinDimension()const;
- friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
+ friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension, bool allowASingleConeOfCutOffDimension);
friend PolyhedralFan product(const PolyhedralFan &a, const PolyhedralFan &b);
IntegerVectorList getRays(int dim=1);//This can be called for other dimensions than 1. The term "Rays" still makes sense modulo the common linearity space
IntegerVectorList getRelativeInteriorPoints();
--- ./halfopencone.h 2013-01-17 02:56:44.000000000 +0400
+++ ../gfan-0.5+dfsg-my/./halfopencone.h 2014-07-30 01:16:18.730161320 +0400
@@ -6,6 +6,9 @@
#include "polyhedralfan.h"
+class HalfOpenCone;
+HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets=false);
+
class HalfOpenCone{
static void appendList(IntegerVectorList &to, IntegerVectorList const &from, int appendValue);
int liftedDimension;//ambient
@@ -18,7 +21,7 @@
HalfOpenCone(int dimension_, IntegerVectorList const &equations, IntegerVectorList const &nonstrict, IntegerVectorList const &strict, bool findFacets=false, bool canonicalize=false);
HalfOpenCone(int ambientDimension);//full space
bool isEmpty();
- friend HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets=false);
+ friend HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets);
friend bool haveEmptyIntersection(const HalfOpenCone &a, const HalfOpenCone &b);
PolyhedralCone closure();
void splitIntoRelativelyOpenCones(list<HalfOpenCone> &l);
