Changeset 11a7dc in git for kernel/gfan.h

Timestamp:

Mar 16, 2010, 6:38:44 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

f524fdf7562a563db23199898e1aa3b16a4619bc

Parents:

706b890c390993bb14ed93acf3c4b09775b93361

Message:

sed s/cout/printf/g
Removed facets2Matrix and interiorPoint2


git-svn-id: file:///usr/local/Singular/svn/trunk@12649 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/gfan.h (modified) (2 diffs)

kernel/gfan.h

@@ -65 +65 @@
                 unsigned numRays;       //Number of spanning rays of the facet
                 ring flipRing;          //the ring on the other side of the facet
-                intvec **fRays;
+//              intvec **fRays;
                                 
                 /** The default constructor. */
@@ -223 +223 @@
                 void getExtremalRays(const gcone &gc);
                 void flip(ideal gb, facet *f);
-                void flip2(const ideal gb, facet *f);
+                void flip2(const ideal &gb, facet *f);
                 void computeInv(const ideal &gb, ideal &inv, const intvec &f);
                 //poly restOfDiv(poly const &f, ideal const &I); removed with r12286
                 inline ideal ffG(const ideal &H, const ideal &G);
                 inline void getGB(ideal const &inputIdeal);             
-                void interiorPoint( dd_MatrixPtr &M, intvec &iv);
-                void interiorPoint2(); //removed Feb 8th, 2010, new method Feb 19th, 2010
+                void interiorPoint( dd_MatrixPtr &M, intvec &iv);//used from flip and optionally from getConeNormals
+//              void interiorPoint2(); //removed Feb 8th, 2010, new method Feb 19th, 2010, again removed Mar 16th, 2010
                 void preprocessInequalities(dd_MatrixPtr &M);
                 ring rCopyAndAddWeight(const ring &r, intvec *ivw);
                 ring rCopyAndAddWeight2(const ring &, const intvec *, const intvec *);
-                ring rCopyAndChangeWeight(const ring &r, intvec *ivw);          
+//              ring rCopyAndChangeWeight(const ring &r, intvec *ivw);  //NOTE remove   
 //              void reverseSearch(gcone *gcAct); //NOTE both removed from r12286
-//              bool isSearchFacet(gcone &gcTmp, facet *testfacet);
-//              void noRevS(gcone &gcRoot, bool usingIntPoint=FALSE);
+//              bool isSearchFacet(gcone &gcTmp, facet *testfacet); //NOTE remove
                 void makeInt(const dd_MatrixPtr &M, const int line, intvec &n);
-//              void normalize();
+//              void normalize();//NOTE REMOVE
                 facet * enqueueNewFacets(facet *f);
                 facet * enqueue2(facet *f);
-                dd_MatrixPtr facets2Matrix(const gcone &gc);
+//              dd_MatrixPtr facets2Matrix(const gcone &gc);//NOTE remove
                 /** Compute the lineality space Ax=0 and return it as dd_MatrixPtr dd_LinealitySpace*/
                 dd_MatrixPtr computeLinealitySpace();