Changeset e2e3ad in git for kernel/gfan.h

Timestamp:

Nov 20, 2009, 6:01:20 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1d77dffe7911bafa212ddec6401c158b5357fe6c

Parents:

68b081826cda1d5edc4a5c9adb3f9ead2a95c338

Message:

bugfix in facet::getFacetNormal
gcone::rootRing removed
Introduced int gcone::pred to store predecessor
Cleanup



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

File:

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

kernel/gfan.h

@@ -68 +68 @@
                 ring flipRing;          //the ring on the other side of the facet
                                         
-                /** The default constructor. Do I need a constructor of type facet(intvec)? */
+                /** The default constructor. */
                 facet();
+                /** Constructor for lower dimensional faces*/
                 facet(int const &n);
-                /** \brief The copy constructor
-                 */
+                /**  The copy constructor */
                 facet(const facet& f);
                 
@@ -119 +119 @@
 {
         private:                
-                ring rootRing;          //good to know this -> generic walk
+//              ring rootRing;          //good to know this -> generic walk
                 ideal inputIdeal;       //the original
                 ring baseRing;          //the basering of the cone                              
                 intvec *ivIntPt;        //an interior point of the cone
                 int UCN;                //unique number of the cone
+                int pred;               //UCN of the cone this one is derived from
                 static int counter;
                 
@@ -159 +160 @@
                 intvec *getIntPoint();
                 void showIntPoint();
+                void setNumFacets();
+                int getNumFacets();
+                int getUCN();
+                int getPredUCN();               
                 void showFacets(short codim=1);
                 void showSLA(facet &f);
@@ -164 +169 @@
                 void invPrint(ideal const &I);
                 bool isMonomial(ideal const &I);
-                void setNumFacets();
-                int getNumFacets();
-                int getUCN();
+                intvec *ivNeg(const intvec *iv);
+                int dotProduct(intvec const &iva, intvec const &ivb);
+                bool isParallel(intvec const &a, intvec const &b);
+                bool areEqual(intvec const &a, intvec const &b);
+                int intgcd(int a, int b);
+                void writeConeToFile(gcone const &gc, bool usingIntPoints=FALSE);
+                void readConeFromFile(int gcNum, gcone *gc);
+                intvec f2M(gcone *gc, facet *f, int n=1);
+                
+                //The real stuff
                 void getConeNormals(ideal const &I, bool compIntPoint=FALSE);
                 void getCodim2Normals(gcone const &gc);
@@ -173 +185 @@
 //              poly restOfDiv(poly const &f, ideal const &I); removed with r12286
                 ideal ffG(ideal const &H, ideal const &G);
-                void getGB(ideal const &inputIdeal);
-                intvec *ivNeg(const intvec *iv);
-                int dotProduct(intvec const &iva, intvec const &ivb);
-                bool isParallel(intvec const &a, intvec const &b);
+                void getGB(ideal const &inputIdeal);            
                 void interiorPoint(dd_MatrixPtr const &M, intvec &iv);
                 ring rCopyAndAddWeight(ring const &r, intvec const *ivw);
-                ring rCopyAndChangeWeight(ring const &r, intvec *ivw);
-                bool areEqual(intvec const &a, intvec const &b);
+                ring rCopyAndChangeWeight(ring const &r, intvec *ivw);          
 //              void reverseSearch(gcone *gcAct); //NOTE both removed from r12286
 //              bool isSearchFacet(gcone &gcTmp, facet *testfacet);
@@ -187 +195 @@
                 void normalize();
                 facet * enqueueNewFacets(facet &f);
-                int intgcd(int a, int b);
-                dd_MatrixPtr facets2Matrix(gcone const &gc);
-                void writeConeToFile(gcone const &gc, bool usingIntPoints=FALSE);
-                void readConeFromFile(int gcNum, gcone *gc);
-                
-//              static void gcone::idPrint(ideal &I);
-                intvec f2M(gcone *gc, facet *f, int n=1);
+                dd_MatrixPtr facets2Matrix(gcone const &gc);            
+//              static void gcone::idPrint(ideal &I);           
                 friend class facet;     
 };