Changeset ce41a2e in git

Timestamp:

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

Author:

Martin Monerjan

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

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

Location:

kernel

Files:

• gfan.cc (modified) (7 diffs)
• gfan.h (modified) (5 diffs)

kernel/gfan.cc

@@ -111 +111 @@
         this->numRays=0;
         this->flipGB=NULL;
-        this->isIncoming=FALSE;
         this->next=NULL;
         this->prev=NULL;                
@@ -135 +134 @@
         this->numRays=0;
         this->flipGB=NULL;
-        this->isIncoming=FALSE;
         this->next=NULL;
         this->prev=NULL;
@@ -255 +253 @@
 }
                 
-inline const intvec *facet::getRef2FacetNormal()
+inline const intvec *facet::getRef2FacetNormal() const
 {
         return(this->fNormal);
@@ -416 +414 @@
 * delete(iv);
 */
-inline intvec *facet::getFacetNormal()
+inline intvec *facet::getFacetNormal() const
 {                               
         return ivCopy(this->fNormal);
@@ -423 +421 @@
 
 /** Method to print the facet normal*/
-inline void facet::printNormal()
+inline void facet::printNormal() const
 {
         fNormal->show();
@@ -4027 +4025 @@
                         }
                         found = line.find("a(");
-//                      intvec *iv2=new intvec(this->numVars);
-//                      if(found!=string::npos)
-//                      {
-//                              line.erase(0,found+2);
-//                              string strweight2=line.substr(0,line.find_first_of(")"));       
-//                              for(int ii=0;ii<this->numVars;ii++)
-//                              {
-//                                      string weight;
-//                                      weight=line.substr(0,line.find_first_of(",)"));
-//                                      (*iv2)[ii]=atol(weight.c_str());
-//                                      line.erase(0,line.find_first_of(",)")+1);
-//                              }
-//                      }
                         
                         ring newRing;
                         if(currRing->order[0]!=ringorder_a)
                         {
-//                              if(iv2!=NULL)
-//                                      newRing=rCopyAndAddWeight2(currRing,iv,iv2);
-//                              else
                                         newRing=rCopyAndAddWeight(currRing,iv);
                         }
                         else
                         {       
-//                              if(iv2==NULL)
-//                              {
                                         newRing=rCopy0(currRing);
                                         int length=this->numVars;
@@ -4063 +4043 @@
                                         newRing->wvhdl[0]=(int*)A;
                                         newRing->block1[0]=length;
-//                              }
-//                              else
-//                              {
-//                                      newRing=rCopy0(currRing);
-//                                      int length=this->numVars;
-//                                      int *A1=(int *)omAlloc0(length*sizeof(int));
-//                                      int *A2=(int *)omAlloc0(length*sizeof(int));
-//                                      for(int jj=0;jj<length;jj++)
-//                                      {
-//                                              A1[jj]=(*iv2)[jj];
-//                                              A2[jj]=(*iv)[jj];                                                               
-//                                      }
-//                                      omFree(newRing->wvhdl[0]);
-//                                      newRing->wvhdl[0]=(int*)A1;
-//                                      newRing->block1[0]=length;
-//                                      if(newRing->wvhdl[1]!=NULL)
-//                                              omFree(newRing->wvhdl[0]);
-//                                      newRing->block1[1]=length;
-//                              }
                         }
                         delete iv;
-//                      delete iv2;
                         rComplete(newRing);
                         gc->baseRing=rCopy(newRing);

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