Changeset cef7ee in git

Timestamp:

May 14, 2009, 11:55:36 AM (15 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c0e207fbb11405ebf5b0060af0a525225c8f26e7

Parents:

787685e7e497280120367f7fab407e5a43d7c629

Message:

*** empty log message ***


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-05-12 15:30:29 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.50 2009-05-12 15:30:29 monerjan Exp $
-$Id: gfan.cc,v 1.50 2009-05-12 15:30:29 monerjan Exp $
+$Date: 2009-05-14 09:55:36 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.51 2009-05-14 09:55:36 monerjan Exp $
+$Id: gfan.cc,v 1.51 2009-05-14 09:55:36 monerjan Exp $
 */
 
@@ -266 +266 @@
                 * direction of the according facet normal
                 */                      
+                //NOTE Prolly need to specify the facet to flip over
                 gcone(const gcone& gc)          
                 {
@@ -1316 +1317 @@
                 /** \brief The new method of Markwig and Jensen
                 */
-                void noRevS(gcone &gc)
+                void noRevS(gcone &gc, bool usingIntPoint=FALSE)
                 {
                         facet *fListPtr = new facet();                  
@@ -1327 +1328 @@
                         ddrows=2;       //Each facet is described by its normal
                         ddcols=gc.numVars+1;    // plus one for the standard simplex
-                        
-                        while(fAct->next!=NULL)
-                        {
-                                /*Compute an interior point for each facet*/                            
-                                dd_MatrixPtr ddineq;    
-                                ddineq=dd_CreateMatrix(ddrows,ddcols);
-                                intvec *comp = new intvec(this->numVars);
-                                comp=fAct->getFacetNormal();                            
-                                for(int ii=0; ii<this->numVars; ii++)                                   
-                                {                                                                               
-                                        dd_set_si(ddineq->matrix[0][ii+1],(*comp)[ii]);
-                                        dd_set_si(ddineq->matrix[1][ii+1],1);   //Assure we search in the pos. orthant                  
-                                }
-                                set_addelem(ddineq->linset,1);  //We want equality in the first row
-                                //dd_WriteMatrix(stdout,ddineq);
-                                interiorPoint(ddineq,*comp);                            
-                                /**/
-#ifdef gfan_DEBUG
-                                cout << "IP is";
-                                comp->show(); cout << endl;
-#endif
-                                //Store the interior point and the UCN
-                                fListPtr->setInteriorPoint( comp );                             
-                                fListPtr->setUCN( gc.getUCN() );        
-                                                        
-                                dd_FreeMatrix(ddineq);
-                                fAct=fAct->next;        //iterate
-                        }                       
+                        if(usingIntPoint){
+                                while(fAct->next!=NULL)
+                                {
+                                        /*Compute an interior point for each facet*/                            
+                                        dd_MatrixPtr ddineq;    
+                                        ddineq=dd_CreateMatrix(ddrows,ddcols);
+                                        intvec *comp = new intvec(this->numVars);
+                                        comp=fAct->getFacetNormal();                            
+                                        for(int ii=0; ii<this->numVars; ii++)                                   
+                                        {                                                                               
+                                                dd_set_si(ddineq->matrix[0][ii+1],(*comp)[ii]);
+                                                dd_set_si(ddineq->matrix[1][ii+1],1);   //Assure we search in the pos. orthant          
+                                        }
+                                        set_addelem(ddineq->linset,1);  //We want equality in the first row
+                                        //dd_WriteMatrix(stdout,ddineq);
+                                        interiorPoint(ddineq,*comp);                            
+                                        /**/
+#ifdef gfan_DEBUG
+                                        cout << "IP is";
+                                        comp->show(); cout << endl;
+#endif
+                                        //Store the interior point and the UCN
+                                        fListPtr->setInteriorPoint( comp );                             
+                                        fListPtr->setUCN( gc.getUCN() );        
+                                                                
+                                        dd_FreeMatrix(ddineq);
+                                        fAct=fAct->next;        //iterate
+                                }       
+                        }               
                         
                         //NOTE Hm, comment in and get a crash for free...
@@ -1380 +1382 @@
                 * Each section starts with its name in CAPITALS
                 */
-                void writeConeToFile(gcone const &gc)
+                void writeConeToFile(gcone const &gc, bool usingIntPoints=FALSE)
                 {
                         ofstream gcOutputFile("/tmp/cone1.gc");
@@ -1400 +1402 @@
                                 fAct = gc.facetPtr;
                                 gcOutputFile << "FACETS" << endl;                                                               
-                                while(fAct!=NULL)
+                                while(fAct->next!=NULL)
                                 {       
                                         intvec *iv = new intvec(gc.numVars);