Changeset 2b3c62f in git

Timestamp:

Jul 2, 2009, 4:50:07 PM (14 years ago)

Author:

Martin Monerjan

Branches:

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

Children:

d47d1f9a7d1ac2d3e103063187d2ec358274680b

Parents:

ae625f2a594a1db9f49dd5783b16e78893533168

Message:

Made SearchList into doubly linked list
enqueue method now returns ptr to first element in purged SL
Does however still not work as expected for three variables


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$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 $
+$Date: 2009-07-02 14:50:07 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.70 2009-07-02 14:50:07 monerjan Exp $
+$Id: gfan.cc,v 1.70 2009-07-02 14:50:07 monerjan Exp $
 */
 
@@ -96 +96 @@
                 bool isIncoming;        //Is the facet incoming or outgoing?
                 facet *next;            //Pointer to next facet
+                facet *prev;            //Pointer to predecessor. Needed for the SearchList in noRevS
                 facet *codim2Ptr;       //Pointer to (codim-2)-facet. Bit of recursion here ;-)
                 int numCodim2Facets;
@@ -113 +114 @@
                         this->flipGB=NULL;
                         this->isIncoming=FALSE;
-                        this->next=NULL;                
+                        this->next=NULL;
+                        this->prev=NULL;                
                         this->flipRing=NULL;
                 }
@@ -133 +135 @@
                         this->isIncoming=FALSE;
                         this->next=NULL;
+                        this->prev=NULL;
                         this->flipRing=NULL;
                 }
@@ -1684 +1687 @@
                                 }
                                 fAct = fAct->next;
-                        }
+                        }                       
                         
                         SearchListAct = SearchListRoot; //Set to beginning of list
+                        /*Make SearchList doubly linked*/
+                        while(SearchListAct!=NULL)
+                        {
+                                if(SearchListAct->next!=NULL)
+                                {
+                                        SearchListAct->next->prev = SearchListAct;
+                                        //SearchListAct = SearchListAct->next;
+                                }
+                                SearchListAct = SearchListAct->next;
+                        }
+                        SearchListAct = SearchListRoot; //Set to beginning of List
                         
                         fAct = gcAct->facetPtr;                 
@@ -1713 +1727 @@
                                         gcTmp->normalize();
                                         /*add facets to SLA here*/
-                                        gcTmp->enqueueNewFacets(*SearchListRoot);
+                                        SearchListRoot=gcTmp->enqueueNewFacets(*SearchListRoot);
                                         gcTmp->showSLA(*SearchListRoot);
                                         rChangeCurrRing(gcAct->baseRing);
@@ -1873 +1887 @@
                 /** 
                 * Takes ptr to search list root
-                */
-                void enqueueNewFacets(facet &f)
-                {
+                * Returns a pointer to new first element of Searchlist
+                */
+                //void enqueueNewFacets(facet &f)
+                facet * enqueueNewFacets(facet &f)
+                {
+                        facet *slHead;
+                        slHead = &f;
                         facet *slAct;   //called with f=SearchListRoot
                         slAct = &f;
@@ -1902 +1920 @@
                                 doNotAdd=TRUE;
                                 fNormal = fAct->getFacetNormal();
-                                slAct = &f;     //return to start of list
+                                slAct = slHead; //return to start of list
                                 codim2Act = fAct->codim2Ptr;
                                 while(slAct!=slEndStatic->next)
@@ -1922 +1940 @@
                                                                 if( !(areEqual(f2Normal,sl2Normal)))
                                                                 {
-                                                                        doNotAdd=FALSE;
+                                                                        doNotAdd=FALSE;                                                 
                                                                         break;                                          
                                                                         
@@ -1930 +1948 @@
                                                         if(doNotAdd==FALSE)
                                                                 break;
-                                                        codim2Act = codim2Act->next;
-                                                        
+                                                        codim2Act = codim2Act->next;                                                    
                                                 }
-                                                //doNotAdd=FALSE;
-                                                //break;
+                                                if(doNotAdd==TRUE)
+                                                {/*dequeue slAct*/
+                                                        if(slAct->prev==NULL && slHead!=NULL)
+                                                        {
+                                                                slHead = slAct->next;
+                                                                slHead->prev = NULL;
+                                                        }
+                                                        else
+                                                        {                                               
+                                                                slAct->prev->next = slAct->next;                                        
+                                                        }
+                                                        //NOTE Memory leak above!
+                                                        break;
+                                                }       
+                                                slAct = slAct->next;
                                         }
-                                        slAct = slAct->next;
+                                        else
+                                        {
+                                                doNotAdd=FALSE;
+                                                break;
+                                        }
+                                        //slAct = slAct->next;
                                         
-                                        if(doNotAdd==FALSE)
-                                                break;                                  
-                                }
+                                        //if(doNotAdd==FALSE)
+                                        //      break;                                  
+                                }//while(slAct!=slEndStatic->next)
                                 if(doNotAdd==FALSE)
                                 {
@@ -1950 +1985 @@
                                 fAct = fAct->next;
                         }
+                        return slHead;
 //                      delete sl2Normal;
 //                      delete slNormal;