Changeset 19addd1 in git for gfanlib/gfanlib_zcone.cpp

Timestamp:

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

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

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

File:

• gfanlib/gfanlib_zcone.cpp (modified) (16 diffs)

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;