Changeset a7f2073 in git

Timestamp:

May 18, 2009, 5:11:53 PM (15 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3131f355cc7139ed1bca8dd189bd09b02d51dc35

Parents:

4e636006a036122ffe86cbfd6e636134782f6672

Message:

New method showFacets
removed all deletes in order to prevent facets from miraculously dissapearing


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-05-15 13:54:46 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.52 2009-05-15 13:54:46 monerjan Exp $
-$Id: gfan.cc,v 1.52 2009-05-15 13:54:46 monerjan Exp $
+$Date: 2009-05-18 15:11:53 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.53 2009-05-18 15:11:53 monerjan Exp $
+$Id: gfan.cc,v 1.53 2009-05-18 15:11:53 monerjan Exp $
 */
 
@@ -89 +89 @@
                 bool isIncoming;        //Is the facet incoming or outgoing?
                 facet *next;            //Pointer to next facet
-                
+                intvec *codim2Normals;
+                                
                 /** The default constructor. Do I need a constructor of type facet(intvec)? */
                 facet()                 
@@ -293 +294 @@
                         
                         fAct->setFacetNormal(ivtmp);
-                        delete ivtmp;                                           
+                        delete ivtmp;
+                        delete fAct;                                            
                 }
                 
@@ -315 +317 @@
                 {
                         ivIntPt->show();
+                }
+                
+                void showFacets()
+                {
+                        facet *f = new facet();
+                        f = this->facetPtr;
+                        intvec *iv = new intvec(this->numVars);
+                        
+                        while (f!=NULL)
+                        {
+                                iv = f->getFacetNormal();
+                                iv->show();
+                                f=f->next;
+                        }
+                        //delete iv;
+                        //delete f;
                 }
                 
@@ -488 +506 @@
                                         (*ivCanonical)[jj]=1;
                                         cout << "dotProd=" << dotProduct(*load,*ivCanonical) << endl;
-                                        if (dotProduct(*load,*ivCanonical)<0)                                   
+                                        if (dotProduct(*load,*ivCanonical)<0)   
+                                        //if (ivMult(load,ivCanonical)<0)
                                         {
                                                 isFlippable=TRUE;
@@ -506 +525 @@
                                         fAct=fAct->next;        //this should definitely not be called in the above while-loop :D
                                 }//if (isFlippable==FALSE)
-                                delete load;
+                                //delete load;
                         }//for (int kk = 0; kk<ddrows; kk++)
                         
@@ -532 +551 @@
                         free(ddnewpos);
                         set_free(ddlinset);
+                        //NOTE Commented out. Solved the bug that after facet2Matrix there were facets lost
+                        //THIS SUCKS
                         dd_free_global_constants();
 
@@ -1316 +1337 @@
                 
                 /** \brief The new method of Markwig and Jensen
+                * Compute gcBasis and facets for the arbitrary starting cone. Store \f$(codim-1)\f$-facets as normals.
+                * In order to represent a facet uniquely compute also the \f$(codim-2)\f$-facets and norm by the gcd of the components.
+                * Keep a list of facets as a linked list containing an intvec and an integer matrix.
+                * Since a \f$(codim-1)\f$-facet belongs to exactly two full dimensional cones, we remove a facet from the list as
+                * soon as we compute this facet again. Comparison of facets is done by...
                 */
                 void noRevS(gcone &gc, bool usingIntPoint=FALSE)
@@ -1322 +1348 @@
                         facet *fAct = new facet();
                         fAct = gc.facetPtr;
-                                                
+                        
+#ifdef gfan_DEBUG
+                        cout << "NoRevs" << endl;
+                        cout << "Facets are:" << endl;
+                        gc.showFacets();
+#endif
+                        
                         dd_set_global_constants();
                         dd_rowrange ddrows;
@@ -1350 +1382 @@
 #endif
                                         //Store the interior point and the UCN
-                                        fListPtr->setInteriorPoint( comp );                             
-                                        fListPtr->setUCN( gc.getUCN() );        
+                                        fListPtr->setInteriorPoint( comp );                             
+                                        fListPtr->setUCN( gc.getUCN() );        
                                                                 
                                         dd_FreeMatrix(ddineq);
@@ -1362 +1394 @@
                                 dd_rowset impl_linset, redset;
                                 dd_ErrorType err;
-                                dd_rowindex newpos;
-                                
+                                dd_rowindex newpos;                     
+
+#ifdef gfan_DEBUG
+                                cout << "before f2M" << endl;
+                                gc.showFacets();
                                 ddineq = facets2Matrix(gc);
+                                cout << "after f2M" << endl;
+                                gc.showFacets();
+#endif
                                 
                                 /*Now set appropriate linearity*/
@@ -1377 +1415 @@
                                         dd_MatrixCanonicalize(&ddakt, &impl_linset, &redset, &newpos, &err);                    
                                         
-//                                      dd_WriteMatrix(stdout,ddakt);
+                                        dd_WriteMatrix(stdout,ddakt);
                                         ddpolyh=dd_DDMatrix2Poly(ddakt, &err);
                                         P=dd_CopyGenerators(ddpolyh);
                                         dd_WriteMatrix(stdout,P);
                                         
-                                        intvec *load = new intvec(this->numVars);
+                                        //intvec *load = new intvec(this->numVars);
                                         
                                         dd_FreeMatrix(ddakt);
                                         dd_FreePolyhedra(ddpolyh);
                                 }
+                                gc.showFacets();
                                 
-                        }                               
+                        }                       
+#ifdef gfan_DEBUG
+                        cout << "Before writeConeToFile" << endl;
+                        gc.showFacets();
+#endif          
+                
                         
                         //NOTE Hm, comment in and get a crash for free...
                         //dd_free_global_constants();                           
                         gc.writeConeToFile(gc);
+#ifdef gfan_DEBUG                       
+                        cout << "After writeConeToFile" << endl;
+                        gc.showFacets();                        
+#endif
                         
                         /*2nd step
@@ -1398 +1446 @@
                         */
                         fAct = fListPtr;
-                        gcone *gcTmp = new gcone(gc);   //copy
+                        //gcone *gcTmp = new gcone(gc); //copy
                         //gcTmp->flip(gcTmp->gcBasis,fAct);
                         //NOTE: gcTmp may be deleted, gcRoot from main proc should probably not!
@@ -1410 +1458 @@
                 {
                         facet *fAct = new facet();
-                        fAct = gc.facetPtr;                     
+                        fAct = gc.facetPtr;
+#ifdef gfan_DEBUG
+                        cout << "gcFacetPtr is at" << &gc.facetPtr << endl;
+                        cout << "fAct is at" << &fAct << endl;
+#endif  
                         dd_MatrixPtr M;
                         dd_rowrange ddrows;
@@ -1416 +1468 @@
                         ddcols=(this->numVars)+1;
                         ddrows=this->numFacets;
-                        M=dd_CreateMatrix(ddrows,ddcols);
+                        M=dd_CreateMatrix(ddrows,ddcols);                       
+#ifdef gfan_DEBUG                       
+                        cout << "in f2M" << endl;
+                        showFacets();
+#endif
                         
                         //dd_set_global_constants();                                            
@@ -1431 +1487 @@
                                 fAct = fAct->next;                              
                         }//jj
-                        delete comp;            
-                        
+#ifdef gfan_DEBUG               
+                        cout << "in f2M" << endl;
+                        showFacets();
+#endif
+                        
+                        //delete fAct;
+                        //delete comp;                  
                         return M;
                 }
@@ -1449 +1510 @@
                 {
                         ofstream gcOutputFile("/tmp/cone1.gc");
+                        facet *fAct = new facet();
+                        fAct = gc.facetPtr;
+                        
                         if (!gcOutputFile)
                         {
@@ -1462 +1526 @@
                                 {                                       
                                         gcOutputFile << p_String((poly)gc.gcBasis->m[ii],gc.baseRing) << endl;
-                                }                       
+                                }                               
                                 
-                                facet *fAct = new facet();
-                                fAct = gc.facetPtr;
                                 gcOutputFile << "FACETS" << endl;                                                               
                                 while(fAct!=NULL)
@@ -1483 +1545 @@
                                         }
                                         fAct=fAct->next;
+                                        //delete iv; iv=NULL;
                                 }                               
                                 
                                 gcOutputFile.close();
-                                delete fAct; fAct=NULL;
-                        }
+                                //delete fAct; fAct=NULL;
+                        }
+                        
                 }//writeConeToFile(gcone const &gc)