Changeset 19addd1 in git for gfanlib

Timestamp:

Oct 25, 2013, 6:22:01 PM (10 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

69b2c1754cbeecd7c1b844e71e2101e1b3794062

Parents:

b7b2c516034df879b01c7c8666bbdf0928da91dc

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2013-10-25 18:22:01+02:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2013-10-25 18:25:28+02:00

Message:

fix: warnings

Location:

gfanlib

Files:

• gfanlib_matrix.h (modified) (2 diffs)
• gfanlib_polyhedralfan.cpp (modified) (3 diffs)
• gfanlib_polymakefile.cpp (modified) (9 diffs)
• gfanlib_q.h (modified) (1 diff)
• gfanlib_symmetriccomplex.cpp (modified) (16 diffs)
• gfanlib_symmetry.cpp (modified) (12 diffs)
• gfanlib_vector.h (modified) (7 diffs)
• gfanlib_zcone.cpp (modified) (16 diffs)
• gfanlib_zcone.h (modified) (1 diff)
• gfanlib_zfan.cpp (modified) (3 diffs)

gfanlib/gfanlib_matrix.h

@@ -69 +69 @@
   void appendRow(Vector<typ> const &v)
     {
-      assert(v.size()==width);
+      assert((int)v.size()==width);
       rows.push_back(v);
       height++;
@@ -410 +410 @@
   {
     assert(typ::isField());
-    assert(v.size()==getWidth());
+    assert((int)v.size()==getWidth());
 
     int pivotI=-1;

gfanlib/gfanlib_polyhedralfan.cpp

@@ -352 +352 @@
 
       bool notAll=false;
-      for(int j=0;j<theCone.indices.size();j++)
+      for(unsigned j=0;j<theCone.indices.size();j++)
         if(dot(rays[theCone.indices[j]],facetCandidates[i]).sign()==0)
           indices.insert(theCone.indices[j]);
@@ -395 +395 @@
 void addFacesToSymmetricComplex(SymmetricComplex &c, ZCone const &cone, ZMatrix const &facetCandidates, ZMatrix const &generatorsOfLinealitySpace)
 {
-  ZMatrix const &rays=c.getVertices();
+  // ZMatrix const &rays=c.getVertices();
   std::set<int> indices;
 
@@ -502 +502 @@
 }
 
-std::string PolyhedralFan::toString(int flags)const
+std::string PolyhedralFan::toString(int /*flags*/)const
 //void PolyhedralFan::printWithIndices(class Printer *p, bool printMultiplicities, SymmetryGroup *sym, bool group, bool ignoreCones, bool xml, bool tPlaneSort, vector<string> const *comments)const
 {

gfanlib/gfanlib_polymakefile.cpp

@@ -53 +53 @@
   list<int> ret;
   int c=s.peek();
-  while((c>='0') && (c<='9')|| (c==' '))
+  while(((c>='0') && (c<='9')) || (c==' '))
     {
       //      fprintf(Stderr,"?\n");
@@ -66 +66 @@
 namespace gfan{
 PolymakeProperty::PolymakeProperty(const std::string &name_, const std::string &value_):
-  name(name_),
-  value(value_)
+  value(value_),
+  name(name_)
 {
 }
@@ -271 +271 @@
 
 
-bool PolymakeFile::readBooleanProperty(const char *p)
+bool PolymakeFile::readBooleanProperty(const char */*p*/)
 {
   return false;
@@ -277 +277 @@
 
 
-void PolymakeFile::writeBooleanProperty(const char *p, bool n)
+void PolymakeFile::writeBooleanProperty(const char */*p*/, bool /*n*/)
 {
 }
@@ -322 +322 @@
   stringstream t;
 
-  if(comments)assert(comments->size()>=m.getHeight());
+  if(comments)assert((int)comments->size()>=m.getHeight());
   if(isXml)
     {
@@ -389 +389 @@
     {
       t<<"<incidence_matrix>";
-      for(int i=0;i<m.size();i++)
+      for(unsigned i=0;i<m.size();i++)
         {
           t<<"<set>";
@@ -405 +405 @@
   else
     {
-      for(int i=0;i<m.size();i++)
+      for(unsigned i=0;i<m.size();i++)
         {
           t<<'{';
@@ -445 +445 @@
     {
       t<<"<vector>";
-      for(int i=0;i<v.size();i++)
+      for(unsigned i=0;i<v.size();i++)
         {
           if(i!=0)t<<" ";
@@ -454 +454 @@
   else
     {
-      for(int i=0;i<v.size();i++)
+      for(unsigned i=0;i<v.size();i++)
         {
           if(i!=0)t<<" ";

gfanlib/gfanlib_q.h

@@ -156 +156 @@
     return mpq_sgn(value);
   }
-  static Rational gcd(Rational const &a, Rational const &b, Rational &s, Rational &t)
+  static Rational gcd(Rational const &a, Rational const /*&b*/, Rational /*&s*/, Rational /*t*/)
   {
 /*    mpz_t r;

gfanlib/gfanlib_symmetriccomplex.cpp

@@ -15 +15 @@
 
 SymmetricComplex::Cone::Cone(std::set<int> const &indices_, int dimension_, Integer multiplicity_, bool sortWithSymmetry, SymmetricComplex const &complex):
+  isKnownToBeNonMaximalFlag(false),
   dimension(dimension_),
   multiplicity(multiplicity_),
-  isKnownToBeNonMaximalFlag(false),
   sortKeyPermutation(complex.n)
 {
@@ -27 +27 @@
   ZMatrix const &vertices=complex.getVertices();
   ZVector sum(vertices.getWidth());
-  for(int i=0;i<indices.size();i++)
+  for(unsigned i=0;i<indices.size();i++)
     sum+=vertices[indices[i]];
 
@@ -56 +56 @@
   ZMatrix const &vertices=complex.getVertices();
   ZVector sum(vertices.getWidth());
-  for(int i=0;i<indices.size();i++)
+  for(unsigned i=0;i<indices.size();i++)
     sum+=vertices[indices[i]];
 
@@ -62 +62 @@
   Permutation const &bestPermutation=sortKeyPermutation;
 
-  assert(bestPermutation.size()==n);
+  assert((int)bestPermutation.size()==n);
 
   IntVector indicesNew(indices.size());
   int I=0;
-  for(int i=0;i<indices.size();i++,I++)
+  for(unsigned i=0;i<indices.size();i++,I++)
     {
       ZVector ny=bestPermutation.apply(complex.vertices[indices[i]]);
@@ -80 +80 @@
 {
   std::set<int> ret;
-  for(int i=0;i<indices.size();i++)
+  for(unsigned i=0;i<indices.size();i++)
     ret.insert(indices[i]);
 
@@ -89 +89 @@
 {
   int next=0;
-  for(int i=0;i<indices.size();i++)
+  for(unsigned i=0;i<indices.size();i++)
     {
       while(1)
         {
-          if(next>=c.indices.size())return false;
+          if(next>=(int)c.indices.size())return false;
           if(indices[i]==c.indices[next])break;
           next++;
@@ -105 +105 @@
 {
   std::set<int> r;
-  for(int i=0;i<indices.size();i++)
+  for(unsigned i=0;i<indices.size();i++)
     {
       ZVector ny=permutation.apply(complex.vertices[indices[i]]);
@@ -139 +139 @@
 {
   ZMatrix l;
-  for(int i=0;i<indices.size();i++)
+  for(unsigned i=0;i<indices.size();i++)
     l.appendRow(complex.vertices[indices[i]]);
 
@@ -150 +150 @@
 SymmetricComplex::SymmetricComplex(ZMatrix const &rays, ZMatrix const &linealitySpace_, SymmetryGroup const &sym_):
   n(rays.getWidth()),
+  linealitySpace(canonicalizeSubspace(linealitySpace_)),
   sym(sym_),
-  dimension(-1),
-  linealitySpace(canonicalizeSubspace(linealitySpace_))
+  dimension(-1)
 {
   assert(rays.getWidth()==linealitySpace.getWidth());
@@ -222 +222 @@
 }
 
-/*
+#if 0
 IntVector SymmetricComplex::dimensionsAtInfinity()const
 {
@@ -228 +228 @@
      dimension of the intersection of each cone in the complex with
      the plane x_0=0 */
-/*
   IntVector ret(cones.size());
 
@@ -247 +246 @@
   return ret;
 }
-*/
+#endif
 
 void SymmetricComplex::buildConeLists(bool onlyMaximal, bool compressed, std::vector<std::vector<IntVector > >*conelist/*, ZMatrix *multiplicities*/)const
@@ -259 +258 @@
       int numberOfOrbitsOutput=0;
       int numberOfOrbitsOfThisDimension=0;
-      bool newDimension=true;
+      // bool newDimension=true;
         {
           int I=0;
           for(ConeContainer::const_iterator i=cones.begin();i!=cones.end();i++,I++)
-                  if(i->dimension==d)
-                    {
-                  numberOfOrbitsOfThisDimension++;
+            if(i->dimension==d)
+            {
+              numberOfOrbitsOfThisDimension++;
               if(!onlyMaximal || isMaximal(*i))
                 {
                   numberOfOrbitsOutput++;
-                  bool isMax=isMaximal(*i);
-                  bool newOrbit=true;
+                  // bool isMax=isMaximal(*i);
+                  // bool newOrbit=true;
                   std::set<std::set<int> > temp;
-                    for(SymmetryGroup::ElementContainer::const_iterator k=sym.elements.begin();k!=sym.elements.end();k++)
-                      {
+                  for(SymmetryGroup::ElementContainer::const_iterator k=sym.elements.begin();k!=sym.elements.end();k++)
+                    {
                         Cone temp1=i->permuted(*k,*this,false);
                         temp.insert(temp1.indexSet());
@@ -291 +290 @@
                           *multiplicities << std::endl;
                         }*/
-                      newOrbit=false;
-                      newDimension=false;
+                      // newOrbit=false;
+                      // newDimension=false;
                     }
-              }
-                    }
-        }
-    }
-
-}
-
-std::string SymmetricComplex::toStringJustCones(int dimLow, int dimHigh, bool onlyMaximal, bool group, std::ostream *multiplicities, bool compressed, bool tPlaneSort)const
+                }
+            }
+        }
+    }
+
+}
+
+std::string SymmetricComplex::toStringJustCones(int dimLow, int dimHigh, bool onlyMaximal, bool group, std::ostream *multiplicities, bool compressed, bool /*tPlaneSort*/)const
 {
   std::stringstream ret;
@@ -392 +391 @@
         {
           bool isBounded=true;
-          for(int j=0;j<i->indices.size();j++)
+          for(unsigned j=0;j<i->indices.size();j++)
             if(vertices[i->indices[j]][0].sign()==0)isBounded=false;
           doAdd=isBounded;
@@ -692 +691 @@
   {
     ZMatrix generators(indices.size(),getAmbientDimension());
-    for(int i=0;i<indices.size();i++)
+    for(unsigned i=0;i<indices.size();i++)
       generators[i]=vertices[indices[i]];
     return ZCone::givenByRays(generators,linealitySpace);

gfanlib/gfanlib_symmetry.cpp

@@ -25 +25 @@
                 TrieNode(IntVector const &v, int i)
                 {
-                        if(i<v.size())
+                  if(i<(int)v.size())
                         m[v[i]]=TrieNode(v,i+1);
                 }
@@ -31 +31 @@
                 {
                   int ret=0;
-                  if(i==v.size())return 1;
+                  if(i==(int)v.size())return 1;
                   for(Map::const_iterator j=m.begin();j!=m.end();j++)
                     {
@@ -41 +41 @@
                 void search(ZVector const &v, ZVector  &building, Permutation &tempPerm, Permutation &ret, ZVector &optimal, int i, bool &isImproving)const
                 {
-                        if(i==v.size()){ret=tempPerm;optimal=building;isImproving=false;return;}
+                  if(i==(int)v.size()){ret=tempPerm;optimal=building;isImproving=false;return;}
                         if(isImproving)
                                 building[i]=-0x7fffffff;
@@ -61 +61 @@
                 void searchStabalizer(ZVector const &v, ZVector  &building, Permutation &tempPerm, Permutation &ret, ZVector &optimal, int i, bool &isImproving, ZVector const &toBeFixed)const
                 {
-                        if(i==v.size())
+                  if(i==(int)v.size())
                                 if(!(tempPerm.apply(v)<optimal))
                                         {
@@ -102 +102 @@
                 void insert(Permutation const &v, int i)
                 {
-                        if(i==v.size())return;
+                  if(i==(int)v.size())return;
                         if(m.count(v[i]))
                                 m[v[i]].insert(v,i+1);
@@ -132 +132 @@
         int n;
         Trie(int n_):
-                n(n_),
-                theTree(Permutation(n_),0)
+                theTree(Permutation(n_),0),
+                n(n_)
         {
         }
@@ -276 +276 @@
   IntVector ret(size());
   assert(size()==b.size());
-  for(int i=0;i<size();i++)ret[i]=b[(*this)[i]];
+  for(unsigned i=0;i<size();i++)ret[i]=b[(*this)[i]];
   return Permutation(ret);
 }
@@ -284 +284 @@
   IntVector ret(size());
   assert(size()==b.size());
-  for(int i=0;i<size();i++)ret[(*this)[i]]=b[i];
+  for(unsigned i=0;i<size();i++)ret[(*this)[i]]=b[i];
   return Permutation(ret);
 }
@@ -292 +292 @@
   IntVector ret(size());
   assert(size()==v.size());
-  for(int i=0;i<size();i++)ret[i]=v[(*this)[i]];
+  for(unsigned i=0;i<size();i++)ret[i]=v[(*this)[i]];
   return ret;
 }
@@ -300 +300 @@
   ZVector ret(size());
   assert(size()==v.size());
-  for(int i=0;i<size();i++)ret[i]=v[(*this)[i]];
+  for(unsigned i=0;i<size();i++)ret[i]=v[(*this)[i]];
   return ret;
 }
@@ -309 +309 @@
   ZVector ret(size());
   assert(size()==v.size());
-  for(int i=0;i<size();i++)ret[(*this)[i]]=v[i];
+  for(unsigned i=0;i<size();i++)ret[(*this)[i]]=v[i];
   return ret;
 }
@@ -431 +431 @@
 ZVector Permutation::fundamentalDomainInequality()const
 {
-  for(int i=0;i<size();i++)
-    if((*this)[i]!=i)
+  for(unsigned i=0;i<size();i++)
+    if((*this)[i]!=(int)i)
       return ZVector::standardVector(size(),i)-ZVector::standardVector(size(),(*this)[i]);
   return ZVector(size());

gfanlib/gfanlib_vector.h

@@ -101 +101 @@
       if(size()<b.size())return true;
       if(size()>b.size())return false;
-      for(int i=0;i<size();i++)
+      for(unsigned i=0;i<size();i++)
         {
           if(v[i]<b[i])return true;
@@ -156 +156 @@
       return pq*pq==pp*qq;
 */
-          int n=p.size();
+          unsigned n=p.size();
           assert(n==q.size());
-          int i;
+          unsigned i;
           for(i=0;i<n;i++)
           {
@@ -167 +167 @@
           typ a=p.v[i];
           typ b=q.v[i];
-          for(int j=0;j<n;j++)
+          for(unsigned j=0;j<n;j++)
             if(a*q.v[j]!=b*p.v[j])return false;
           return true;
@@ -175 +175 @@
   // Arithmetic slow
   //-----------------
-  inline friend Vector operator*(typ s, const Vector& q){Vector p=q;for(int i=0;i<q.size();i++)p[i]*=s;return p;}
+  inline friend Vector operator*(typ s, const Vector& q){Vector p=q;for(unsigned i=0;i<q.size();i++)p[i]*=s;return p;}
 //  inline friend Vektor operator/(const Vektor& q, typ s){Vektor p=q;for(int i=0;i<q.size();i++)p[i]/=s;return p;}
 /*  inline friend Vector operator*(const Vektor& p, const Vektor& q){assert(p.size()==q.size());Vektor p1=p;for(int i=0;i<p.size();i++)p1.v[i]*=q.v[i];return p1;}
@@ -181 +181 @@
 */
   inline friend Vector operator/(const Vector& p, typ const &s){Vector ret(p.size());for(unsigned i=0;i<p.size();i++)ret[i]=p[i]/s;return ret;}
-  inline friend Vector operator+(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(int i=0;i<p.size();i++)p1[i]+=q[i];return p1;}
-  inline friend Vector operator-(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(int i=0;i<p.size();i++)p1[i]-=q[i];return p1;}
-  inline friend Vector max(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(int i=0;i<p.size();i++)if(p1[i]<q[i])p1[i]=q[i];return p1;}
-  inline friend Vector min(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(int i=0;i<p.size();i++)if(p1[i]>q[i])p1[i]=q[i];return p1;}
+  inline friend Vector operator+(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(unsigned i=0;i<p.size();i++)p1[i]+=q[i];return p1;}
+  inline friend Vector operator-(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(unsigned i=0;i<p.size();i++)p1[i]-=q[i];return p1;}
+  inline friend Vector max(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(unsigned i=0;i<p.size();i++)if(p1[i]<q[i])p1[i]=q[i];return p1;}
+  inline friend Vector min(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(unsigned i=0;i<p.size();i++)if(p1[i]>q[i])p1[i]=q[i];return p1;}
 
   friend Vector operator-(const Vector &b)
   {
     Vector ret(b.size());
-    for(int i=0;i<b.size();i++)ret[i]=-b[i];
+    for(unsigned i=0;i<b.size();i++)ret[i]=-b[i];
     return ret;
   }
@@ -226 +226 @@
     {
       assert(begin>=0);
-      assert(end<=size());
+      assert(end<=(int)size());
       assert(end>=begin);
       Vector ret(end-begin);
@@ -293 +293 @@
     typ temp1,temp2;
     typ ret(1);
-    for(int i=0;i<size();i++)
+    for(unsigned i=0;i<size();i++)
       ret=typ::gcd(ret,v[i],temp1,temp2);
     return ret;

gfanlib/gfanlib_zcone.cpp

@@ -44 +44 @@
     dd_colrange d_input,j;
     dd_RepresentationType rep=dd_Inequality;
-    dd_boolean found=dd_FALSE, newformat=dd_FALSE, successful=dd_FALSE;
-    char command[dd_linelenmax], comsave[dd_linelenmax];
+    // dd_boolean found=dd_FALSE, newformat=dd_FALSE, successful=dd_FALSE;
+    // char command[dd_linelenmax], comsave[dd_linelenmax];
     dd_NumberType NT;
 
     (*Error)=dd_NoError;
 
-    rep=dd_Inequality; newformat=dd_TRUE;
+    rep=dd_Inequality; // newformat=dd_TRUE;
 
     m_input=g.getHeight();
@@ -70 +70 @@
     }
 
-    successful=dd_TRUE;
+    // successful=dd_TRUE;
 
     return M;
@@ -108 +108 @@
   {
     bool ret;
-    dd_MatrixPtr M=NULL,M2=NULL,M3=NULL;
-    dd_colrange d;
+    dd_MatrixPtr M=NULL/*,M2=NULL,M3=NULL*/;
+    // dd_colrange d;
     dd_ErrorType err=dd_NoError;
-    dd_rowset redrows,linrows,ignoredrows, basisrows;
-    dd_colset ignoredcols, basiscols;
-    dd_DataFileType inputfile;
-    FILE *reading=NULL;
+    // dd_rowset redrows,linrows,ignoredrows, basisrows;
+    // dd_colset ignoredcols, basiscols;
+    // dd_DataFileType inputfile;
+    // FILE *reading=NULL;
 
     cddinitGmp();
@@ -121 +121 @@
     if (err!=dd_NoError) goto _L99;
 
-    d=M->colsize;
+    // d=M->colsize;
 
     static dd_Arow temp;
@@ -339 +339 @@
     if(numberOfRows==0)return;//the full space, so description is already irredundant
 
-    dd_rowset r=NULL;
+    // dd_rowset r=NULL;
     ZMatrix g=inequalities;
     g.append(equations);
 
-    dd_LPSolverType solver=dd_DualSimplex;
+    // dd_LPSolverType solver=dd_DualSimplex;
     dd_MatrixPtr A=NULL;
     dd_ErrorType err=dd_NoError;
@@ -402 +402 @@
     int numberOfRows=numberOfEqualities+numberOfInequalities;
 
-    dd_rowset r=NULL;
+    // dd_rowset r=NULL;
     ZMatrix g=inequalities;
     g.append(equations);
@@ -448 +448 @@
   void dual(ZMatrix const &inequalities, ZMatrix const &equations, ZMatrix &dualInequalities, ZMatrix &dualEquations)
   {
-    int result;
+    // int result;
 
     dd_MatrixPtr A=NULL;
@@ -472 +472 @@
 
     return;
-   _L99:
-    assert(0);
+   // _L99:
+   //  assert(0);
   }
   // this procedure is take from cddio.c.
@@ -556 +556 @@
     int dim2=inequalities.getHeight();
     if(dim2==0)return std::vector<std::vector<int> >();
-    int dimension=inequalities.getWidth();
+    // int dimension=inequalities.getWidth();
 
     dd_MatrixPtr A=NULL;
@@ -603 +603 @@
 
     return ret;
-   _L99:
-    assert(0);
-    return std::vector<std::vector<int> >();
+   // _L99:
+   //  assert(0);
+   //  return std::vector<std::vector<int> >();
   }
 
@@ -707 +707 @@
           inequalities=LpSolver::fastNormals(inequalities2);
           goto noFallBack;
-        fallBack://alternativ (disabled)
-          lpSolver.removeRedundantRows(inequalities,equations,true);
+        // fallBack://alternativ (disabled)
+        //   lpSolver.removeRedundantRows(inequalities,equations,true);
         noFallBack:;
         }
@@ -730 +730 @@
 }
 
-std::ostream &operator<<(std::ostream &f, ZCone const &c)
+void operator<<(std::ostream &f, ZCone const &c)
 {
   f<<"Ambient dimension:"<<c.n<<std::endl;
@@ -741 +741 @@
 
 ZCone::ZCone(int ambientDimension):
+  preassumptions(PCP_impliedEquationsKnown|PCP_facetsKnown),
+  state(1),
+  n(ambientDimension),
+  multiplicity(1),
+  linearForms(ZMatrix(0,ambientDimension)),
   inequalities(ZMatrix(0,ambientDimension)),
   equations(ZMatrix(0,ambientDimension)),
-  n(ambientDimension),
-  state(1),
-  preassumptions(PCP_impliedEquationsKnown|PCP_facetsKnown),
+  haveExtremeRaysBeenCached(false)
+{
+}
+
+
+ZCone::ZCone(ZMatrix const &inequalities_, ZMatrix const &equations_, int preassumptions_):
+  preassumptions(preassumptions_),
+  state(0),
+  n(inequalities_.getWidth()),
   multiplicity(1),
-  haveExtremeRaysBeenCached(false),
-  linearForms(ZMatrix(0,ambientDimension))
-{
-}
-
-
-ZCone::ZCone(ZMatrix const &inequalities_, ZMatrix const &equations_, int preassumptions_):
+  linearForms(ZMatrix(0,inequalities_.getWidth())),
   inequalities(inequalities_),
   equations(equations_),
-  state(0),
-  preassumptions(preassumptions_),
-  multiplicity(1),
-  haveExtremeRaysBeenCached(false),
-  n(inequalities_.getWidth()),
-  linearForms(ZMatrix(0,inequalities_.getWidth()))
+  haveExtremeRaysBeenCached(false)
   {
   assert(preassumptions_<4);//OTHERWISE WE ARE DOING SOMETHING STUPID LIKE SPECIFYING AMBIENT DIMENSION
@@ -1042 +1042 @@
   std::vector<std::vector<int> > indices=lpSolver.extremeRaysInequalityIndices(inequalities);
 
-  for(int i=0;i<indices.size();i++)
+  for(unsigned i=0;i<indices.size();i++)
     {
       /* At this point we know lineality space, implied equations and
@@ -1082 +1082 @@
 
           std::vector<int> asVector(inequalities.getHeight());
-          for(int j=0;j<indices[i].size();j++){asVector[indices[i][j]]=1;}
+          for(unsigned j=0;j<indices[i].size();j++){asVector[indices[i][j]]=1;}
           ZMatrix equations=this->equations;
           ZVector theInequality;
 
-          for(int j=0;j<asVector.size();j++)
+          for(unsigned j=0;j<asVector.size();j++)
             if(asVector[j])
               equations.appendRow(inequalities[j]);
@@ -1229 +1229 @@
 ZCone ZCone::faceContaining(ZVector const &v)const
 {
-  assert(n==v.size());
+  assert(n==(int)v.size());
   assert(contains(v));
   ZMatrix newEquations=equations;

gfanlib/gfanlib_zcone.h

@@ -352 +352 @@
      */
    // PolyhedralCone projection(int newn)const;
-    friend std::ostream &operator<<(std::ostream &f, ZCone const &c);
+    friend void operator<<(std::ostream &f, ZCone const &c);
 };
 

gfanlib/gfanlib_zfan.cpp

@@ -16 +16 @@
   {
     assert(dimension>=0);
-    if(dimension>=T.size())return 0;
+    if(dimension>=(int)T.size())return 0;
     return T[dimension].size();
   }
@@ -162 +162 @@
 
 //        log2 cerr<< "Number of orbits to expand "<<cones.size()<<endl;
-        for(int i=0;i<cones.size();i++)
+        for(unsigned i=0;i<cones.size();i++)
         //  if(coneIndices==0 || coneIndices->count(i))
             {
@@ -202 +202 @@
   }
   ZFan::ZFan(ZFan const& f):
+    coneCollection(0),
     complex(0),
-    coneCollection(0),
     cones(f.table(0,0)),
     maximalCones(f.table(0,1)),