Changeset 5ece85 in git

Timestamp:

Jan 29, 2010, 10:51:19 AM (13 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

20d4b60dbf3e6336262bc0f3909917d6f602bbe6

Parents:

be6689fe956f0a8b1125b510d5502af93d70d021

Message:

int facet::numRays serves the same as numCodim2Facets
Crude idea of sorting rays lexicographically


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

Location:

kernel

Files:

• gfan.cc (modified) (13 diffs)
• gfan.h (modified) (3 diffs)

kernel/gfan.cc

@@ -32 +32 @@
 #include <time.h>
 #include <sys/time.h>
+#include <stdlib.h>
 //#include <gmpxx.h>
-#include <vector>
+// #include <vector>
+
 
 /*DO NOT REMOVE THIS*/
@@ -93 +95 @@
         this->codim=1;          //default for (codim-1)-facets
         this->numCodim2Facets=0;
+        this->numRays=0;
         this->flipGB=NULL;
         this->isIncoming=FALSE;
@@ -116 +119 @@
         }//NOTE Handle exception here!                  
         this->numCodim2Facets=0;
+        this->numRays=0;
         this->flipGB=NULL;
         this->isIncoming=FALSE;
@@ -503 +507 @@
  * This is mainly for debugging purposes. Usually called from within gdb
  */
-inline void gcone::showFacets(const short codim)
-{
-        facet *f;
-        switch(codim)
+volatile void gcone::showFacets(const short codim)
+{
+        facet *f=this->facetPtr;
+        facet *f2=NULL;
+        if(codim==2)
+                f2=this->facetPtr->codim2Ptr;
+        /*switch(codim)
         {
                 case 1:
@@ -512 +519 @@
                         break;
                 case 2:
-                        f = this->facetPtr->codim2Ptr;
+                        f2 = this->facetPtr->codim2Ptr;
                         break;
-        }       
+        }*/     
         while(f!=NULL)
         {
@@ -526 +533 @@
                         cout << ") ";
                 delete iv;
+                if(codim==2)
+                {
+                        f2=f->codim2Ptr;
+                        while(f2!=NULL)
+                        {
+                                cout << "[";
+                                f2->getFacetNormal()->show(1,0);
+                                cout << "]";
+                                f2 = f2->next;
+                        }
+                        cout << endl;
+                }
                 f=f->next;
         }
@@ -1182 +1201 @@
         dd_MatrixPtr P;
         P=dd_CopyGenerators(ddPolyh);
-        dd_FreePolyhedra(ddPolyh);
+        dd_FreePolyhedra(ddPolyh);      
         //Loop through the rows of P and check whether fNormal*row[i]=0 => row[i] belongs to fNormal
         int rows=P->rowsize;
@@ -1209 +1228 @@
                                 }
                                 codim2Act->setFacetNormal(rowvec);
-                                //Check flippability                            
+                                fAct->numRays++;                        
                         }
                         delete(rowvec);
-                }               
+                }
+                //Now (if we have at least 3 variables) do a bubblesort on the rays
+                /*if(this->numVars>2)
+                {
+                        facet *A[fAct->numRays-1];
+                        facet *f2Act=fAct->codim2Ptr;
+                        for(unsigned ii=0;ii<fAct->numRays;ii++)
+                        {
+                                A[ii]=f2Act;
+                                f2Act=f2Act->next;
+                        }
+                        bool exchanged=FALSE;
+                        unsigned n=fAct->numRays-1;
+                        do
+                        {
+                                exchanged=FALSE;//n=fAct->numRays-1;                            
+                                for(unsigned ii=0;ii<=n-1;ii++)
+                                {                                       
+                                        if((A[ii]->fNormal)->compare((A[ii+1]->fNormal))==1)
+                                        {
+                                                //Swap rays
+                                                cout << "Swapping ";
+                                                A[ii]->fNormal->show(1,0); cout << " with "; A[ii+1]->fNormal->show(1,0); cout << endl;
+                                                A[ii]->next=A[ii+1]->next;
+                                                if(ii>0)
+                                                        A[ii-1]->next=A[ii+1];
+                                                A[ii+1]->next=A[ii];
+                                                if(ii==0)
+                                                        fAct->codim2Ptr=A[ii+1];
+                                                //end swap
+                                                facet *tmp=A[ii];//swap in list
+                                                A[ii+1]=A[ii];
+                                                A[ii]=tmp;
+//                                              tmp=NULL;                       
+                                        }                                       
+                                }
+                                n--;                    
+                        }while(exchanged==TRUE && n>=0);
+                }*///if pVariables>2
                 delete fNormal;         
                 fAct = fAct->next;
@@ -1218 +1275 @@
         //Now all extremal rays should be set w.r.t their respective fNormal
         //TODO Not sufficient -> vol2 II/125&127
+        //NOTE Sufficient according to cddlibs doc. These ARE rays
         fAct=gc.facetPtr;
         while(fAct!=NULL)
@@ -1250 +1308 @@
                 fAct = fAct->next;
         }
+        
+        
 #ifdef gfanp
         gettimeofday(&end, 0);
@@ -1648 +1708 @@
                         }
                         if (isParallel(*check,fNormal)) //pass *check when 
+//                      if(fNormal.compare(check)==0)
                         {
                                 //Found a parallel vector. Add it
@@ -2290 +2351 @@
                                         //while(codim2Act!=NULL)
                         for(int jj=0;jj<fAct->numCodim2Facets;jj++)
+//                      for(int jj=0;jj<fAct->numRays-1;jj++)
                         {
                                 intvec *f2Normal;
@@ -3147 +3209 @@
         return rCopy(this->baseRing);
 }
+/** \brief Sort the rays of a facet lexicographically
+*/
+void gcone::sortRays(gcone *gc)
+{
+        facet *fAct;
+        fAct = this->facetPtr->codim2Ptr;
+//      while(fAct->next!=NULL)
+//      {
+//              if(fAct->fNormal->compare(fAct->fNormal->next)==-1
+//      }
+}
+
 /** \brief Gather the output
 * List of lists

kernel/gfan.h

@@ -76 +76 @@
                 int numCodim2Facets;    //#of (codim-2)-facets of this facet. Set in getCodim2Normals()
                 ring flipRing;          //the ring on the other side of the facet
-                                        
+                unsigned numRays;       //Number of spanning rays of the cone                   
                 /** The default constructor. */
                 facet();
@@ -195 +195 @@
                 inline int getUCN();
                 inline int getPredUCN();                
-                inline void showFacets(short codim=1);
+                volatile void showFacets(short codim=1);
                 inline volatile void showSLA(facet &f);
                 inline void idDebugPrint(const ideal &I);
@@ -209 +209 @@
                 inline void readConeFromFile(int gcNum, gcone *gc);
                 inline intvec f2M(gcone *gc, facet *f, int n=1);
-                
+                inline void sortRays(gcone *gc);
                 //The real stuff
                 inline void getConeNormals(const ideal &I, bool compIntPoint=FALSE);