Changeset ce41a2e in git for kernel/gfan.h

Timestamp:

Mar 16, 2010, 8:34:46 AM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

706b890c390993bb14ed93acf3c4b09775b93361

Parents:

ec6c521f728502456c5e851b7943d2d5202de7c2

Message:

facet::isIncoming no longer exists
some methods are const now
cleanup in readConeFromFile


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

File:

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

kernel/gfan.h

@@ -22 +22 @@
 #endif
 extern int gfanHeuristic;
-// extern dd_MatrixPtr ddLinealitySpace;
-
-// #ifdef gfanp
-// extern       static float time_getConeNormals;
-// extern       static float time_getCodim2Normals;
-// extern       static float time_flip;
-// extern       static float time_enqueue;
-// extern       static float time_computeInv;
-// #endif
-//ideal getGB(ideal inputIdeal);
-// ideal gfan(ideal inputIdeal, int heuristic);
+
 lists gfan(ideal inputIdeal, int heuristic);
-//int dotProduct(intvec a, intvec b);
-//bool isParallel(intvec a, intvec b);
 
 class facet
@@ -70 +58 @@
                  */     
                 bool isFlippable;       //**flippable facet? */
-                bool isIncoming;        //Is the facet incoming or outgoing in the reverse search?
+                //bool isIncoming;      //Is the facet incoming or outgoing in the reverse search? No longer in use
                 facet *next;            //Pointer to next facet
                 facet *prev;            //Pointer to predecessor. Needed for the SearchList in noRevS
@@ -93 +81 @@
 //              inline bool operator==(const facet *f,const facet *g);                  
                 /** \brief Comparison of facets*/
-                inline bool areEqual(facet *f, facet *g);
+//              inline bool areEqual(facet *f, facet *g);//Now static
                 /** Stores the facet normal \param intvec*/
                 inline void setFacetNormal(intvec *iv);
                 /** Returns the facet normal */
-                inline intvec *getFacetNormal();
+                inline intvec *getFacetNormal() const;
                 /** Return a reference to the facet normal*/
-                inline const intvec *getRef2FacetNormal();
+                inline const intvec *getRef2FacetNormal() const;
                 /** Method to print the facet normal*/
-                inline void printNormal();
+                inline void printNormal() const;
                 /** Store the flipped GB*/
                 inline void setFlipGB(ideal I);
@@ -136 +124 @@
 {
         private:                
-                //ring rootRing;                //good to know this -> generic walk
                 ideal inputIdeal;       //the original
                 ring baseRing;          //the basering of the cone                              
@@ -272 +259 @@
 static bool isMonomial(const ideal &I);
 static bool ivAreEqual(const intvec &a, const intvec &b);
-static bool areEqual2(facet* f, facet *g);
-static bool areEqual( facet *f,  facet *g);
+static bool areEqual2(facet *f, facet *g);
+static bool areEqual( facet *f, facet *g);
 // bool iv64isStrictlyPositive(intvec *);
 #endif