Changeset 7379a77 in git

Timestamp:

Jul 1, 2009, 11:41:00 AM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

c4c127743ed450cab07372ff8921b84b9a15e6db

Parents:

2126c0d13d7a85352b229c0bd8232fb6cd6d726d

Message:

Bugfix codim2 computation


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-06-29 14:46:58 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.68 2009-06-29 14:46:58 monerjan Exp $
-$Id: gfan.cc,v 1.68 2009-06-29 14:46:58 monerjan Exp $
+$Date: 2009-07-01 09:41:00 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.69 2009-07-01 09:41:00 monerjan Exp $
+$Id: gfan.cc,v 1.69 2009-07-01 09:41:00 monerjan Exp $
 */
 
@@ -587 +587 @@
 
 #ifdef gfan_DEBUG
-                        cout << "The inequality matrix is" << endl;
-                        dd_WriteMatrix(stdout, ddineq);
+//                      cout << "The inequality matrix is" << endl;
+//                      dd_WriteMatrix(stdout, ddineq);
 #endif
 
@@ -608 +608 @@
                         ddcols = ddineq->colsize;
 #ifdef gfan_DEBUG
-                        cout << "Having removed redundancies, the normals now read:" << endl;
-                        dd_WriteMatrix(stdout,ddineq);
-                        cout << "Rows = " << ddrows << endl;
-                        cout << "Cols = " << ddcols << endl;
+//                      cout << "Having removed redundancies, the normals now read:" << endl;
+//                      dd_WriteMatrix(stdout,ddineq);
+//                      cout << "Rows = " << ddrows << endl;
+//                      cout << "Cols = " << ddcols << endl;
 #endif
                         
@@ -655 +655 @@
                                 {
 #ifdef gfan_DEBUG
-                                        cout << "Ignoring facet";
+                                        cout << "Ignoring facet" << endl;
                                         load->show();
+                                        cout << endl;
                                         //fAct->next=NULL;
 #endif
@@ -721 +722 @@
                 void getCodim2Normals(gcone const &gc)
                 {
-                        //this->facetPtr->codim2Ptr = new facet(2);     //instantiate a (codim-2)-facet                 
+                        //this->facetPtr->codim2Ptr = new facet(2);     //instantiate a (codim-2)-facet
+                        facet *fAct;
+                        fAct = this->facetPtr;          
                         facet *codim2Act;
                         //codim2Act = this->facetPtr->codim2Ptr;
@@ -737 +740 @@
                         dd_PolyhedraPtr ddpolyh;
                         for (int ii=0; ii<this->numFacets; ii++)
+                        //while(fAct!=NULL)
                         {                               
                                 ddakt = dd_CopyMatrix(ddineq);
@@ -750 +754 @@
                                 P=dd_CopyGenerators(ddpolyh);
 #ifdef gfan_DEBUG
-//                              dd_WriteMatrix(stdout,P);
+//                              cout << "Codim2 facet:" << endl;
+//                              dd_WriteMatrix(stdout,P);
+//                              cout << endl;
 #endif
                                         
@@ -759 +765 @@
                                 for (int jj=1;jj<=P->rowsize;jj++)
                                 {
-                                        this->facetPtr->numCodim2Facets++;
-                                        if(this->facetPtr->numCodim2Facets==1)
+                                        //this->facetPtr->numCodim2Facets++;
+                                        fAct->numCodim2Facets++;
+                                        if(fAct->numCodim2Facets==1)
+                                        //if(this->facetPtr->numCodim2Facets==1)                                        
                                         {
-                                                this->facetPtr->codim2Ptr = new facet(2);
-                                                codim2Act = this->facetPtr->codim2Ptr;
+                                                //this->facetPtr->codim2Ptr = new facet(2);
+                                                fAct->codim2Ptr = new facet(2);
+                                                //codim2Act = this->facetPtr->codim2Ptr;
+                                                codim2Act = fAct->codim2Ptr;
                                         }
                                         else
@@ -782 +792 @@
                                         delete n;*/
                                 }                                                                               
-                                        
+                                fAct = fAct->next;      
                                 dd_FreeMatrix(ddakt);
                                 dd_FreePolyhedra(ddpolyh);
-                        }
+                        }//while
                 }
                 
@@ -1378 +1388 @@
                         }
 #ifdef gfan_DEBUG
-                        iv.show();
-                        cout << endl;
+//                      iv.show();
+//                      cout << endl;
 #endif
                         mpq_clear(qkgV);
@@ -1395 +1405 @@
                 
                 /** \brief Copy a ring and add a weighted ordering in first place
-                * Kudos to walkSupport.cc
+                * 
                 */
                 ring rCopyAndAddWeight(ring const &r, intvec const *ivw)                                
@@ -1720 +1730 @@
                                 {
                                         if( gcNext->getUCN() == UCNcounter+1 )
-                                        {//NOTE THIS IS BUGGY. Apparently changes to the wrong ring
+                                        {
                                                 gcAct = gcNext;
                                                 rAct=rCopy(gcAct->baseRing);
@@ -1842 +1852 @@
                                         (*n)[ii] = ((*n)[ii])/ggT;
                                 }
+                                codim2Act->setFacetNormal(n);
                                 codim2Act = codim2Act->next;                            
                         }
@@ -1868 +1879 @@
                         slAct = &f;
                         facet *slEnd;   //Pointer to end of SLA
-                        slEnd = &f;             
+                        slEnd = &f;
+                        facet *slEndStatic;     //marks the end before a new facet is added             
                         facet *fAct;
                         fAct = this->facetPtr;
@@ -1880 +1892 @@
                                 slEnd=slEnd->next;
                         }
+                        slEndStatic = slEnd;
                         /*1st step: compare facetNormals*/
                         intvec *fNormal = new intvec(this->numVars);
@@ -1887 +1900 @@
                         while(fAct!=NULL)
                         {
-                                doNotAdd=FALSE;
+                                doNotAdd=TRUE;
                                 fNormal = fAct->getFacetNormal();
                                 slAct = &f;     //return to start of list
-                                while(slAct!=NULL)
+                                codim2Act = fAct->codim2Ptr;
+                                while(slAct!=slEndStatic->next)
                                 {
                                         slNormal = slAct->getFacetNormal();                                     
@@ -1898 +1912 @@
                                         {
                                                 //NOTE check codim2facets here
-//                                              while(codim2Act!=NULL)
-//                                              {
-//                                                      f2Normal = codim2Act->getFacetNormal();
-//                                                      sl2Act = f.codim2Ptr;
-//                                                      while(sl2Act!=NULL)
-//                                                      {
-//                                                              sl2Normal = sl2Act->getFacetNormal();
-//                                                              if(!isParallel(f2Normal,sl2Normal))
-//                                                              {
-//                                                                      doNotAdd=FALSE;
-//                                                                      break;
-//                                                              }
-//                                                              sl2Act = sl2Act->next;
-//                                                      }
-//                                                      if(doNotAdd==FALSE)
-//                                                              break;
-//                                                      codim2Act = codim2Act->next;
-//                                                      
-//                                              }
-                                                doNotAdd=FALSE;
-                                                break;
+                                                codim2Act = fAct->codim2Ptr;
+                                                while(codim2Act!=NULL)
+                                                {
+                                                        f2Normal = codim2Act->getFacetNormal();
+                                                        sl2Act = f.codim2Ptr;
+                                                        while(sl2Act!=NULL)
+                                                        {
+                                                                sl2Normal = sl2Act->getFacetNormal();
+                                                                if( !(areEqual(f2Normal,sl2Normal)))
+                                                                {
+                                                                        doNotAdd=FALSE;
+                                                                        break;                                          
+                                                                        
+                                                                }
+                                                                sl2Act = sl2Act->next;
+                                                        }
+                                                        if(doNotAdd==FALSE)
+                                                                break;
+                                                        codim2Act = codim2Act->next;
+                                                        
+                                                }
+                                                //doNotAdd=FALSE;
+                                                //break;
                                         }
                                         slAct = slAct->next;
+                                        
+                                        if(doNotAdd==FALSE)
+                                                break;                                  
                                 }
                                 if(doNotAdd==FALSE)