Changeset 398e35 in git

Timestamp:

Jul 22, 2009, 11:57:23 AM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

9be65c2f015f278636f0f197b120707fa72d825f

Parents:

c17211fd987aecab4e77b072748408f46325a27b

Message:

Complete tailreduction for getGB of input
Fix for empty SLA while fAct!=NULL


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-07-21 15:56:28 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.79 2009-07-21 15:56:28 monerjan Exp $
-$Id: gfan.cc,v 1.79 2009-07-21 15:56:28 monerjan Exp $
+$Date: 2009-07-22 09:57:23 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.80 2009-07-22 09:57:23 monerjan Exp $
+$Id: gfan.cc,v 1.80 2009-07-22 09:57:23 monerjan Exp $
 */
 
@@ -534 +534 @@
                 int getUCN()
                 {
-                        return this->UCN;
+                        if(this!=NULL)
+                                return this->UCN;
+                        else
+                                return -1;
                 }
                 
@@ -1172 +1175 @@
 #endif
                         ideal dstRing_I;                        
-                        dstRing_I=idrCopyR(srcRing_HH,srcRing);                 
+                        dstRing_I=idrCopyR(srcRing_HH,srcRing);
+                        //dstRing_I=idrCopyR(inputIdeal,srcRing);
                         //validOpts<1>=TRUE;
 #ifdef gfan_DEBUG
@@ -1179 +1183 @@
                         BITSET save=test;
                         test|=Sy_bit(OPT_REDSB);
+                        test|=Sy_bit(OPT_REDTAIL);
                         test|=Sy_bit(6);        //OPT_DEBUG
                         ideal tmpI;
                         tmpI = idrCopyR(this->inputIdeal,this->baseRing);                               
                         dstRing_I=kStd(tmpI,NULL,testHomog,NULL);                                       
-                        kInterRed(dstRing_I);
+                        //kInterRed(dstRing_I);
                         idSkipZeroes(dstRing_I);
                         test=save;
@@ -1295 +1300 @@
                 *\return void
                 */
-                void getGB(ideal const &inputIdeal)
-                {
+                void getGB(ideal const &inputIdeal)             
+                {
+                        BITSET save=test;
+                        test|=Sy_bit(OPT_REDSB);
+                        test|=Sy_bit(OPT_REDTAIL);
                         ideal gb;
                         gb=kStd(inputIdeal,NULL,testHomog,NULL);
                         idSkipZeroes(gb);
                         this->gcBasis=gb;       //write the GB into gcBasis
+                        test=save;
                 }//void getGB
                 
@@ -2012 +2021 @@
                         facet *sl2Act;
                         sl2Act = f.codim2Ptr;
+                        facet *deleteMarker;
+                        deleteMarker = NULL;
                         
                         bool doNotAdd=FALSE;
@@ -2038 +2049 @@
                                         slAct = slHead;
                                         notParallelCtr=0;
+                                        /*If slAct==NULL and fAct!=NULL 
+                                        we just copy all remaining facets into SLA*/
+                                        if(slAct==NULL)
+                                        {
+                                                facet *fCopy;
+                                                fCopy = fAct;
+                                                while(fCopy!=NULL)
+                                                {
+                                                        if(slAct==NULL)
+                                                        {
+                                                                slAct = new facet();
+                                                                slHead = slAct;                                                         
+                                                        }
+                                                        else
+                                                        {
+                                                                slAct->next = new facet();
+                                                                slAct = slAct->next;
+                                                        }                                                       
+                                                        slAct->setFacetNormal(fAct->getFacetNormal());
+                                                        slAct->setUCN(fAct->getUCN());
+                                                        slAct->isFlippable=fAct->isFlippable;
+                                                        facet *f2Copy;
+                                                        f2Copy = fCopy->codim2Ptr;
+                                                        sl2Act = slAct->codim2Ptr;
+                                                        while(f2Copy!=NULL)
+                                                        {
+                                                                if(sl2Act==NULL)
+                                                                {
+                                                                        sl2Act = new facet(2);
+                                                                        slAct->codim2Ptr = sl2Act;                                      
+                                                                }
+                                                                else
+                                                                {
+                                                                        facet *marker;
+                                                                        marker = sl2Act;
+                                                                        sl2Act->next = new facet(2);
+                                                                        sl2Act = sl2Act->next;
+                                                                        sl2Act->prev = marker;
+                                                                }
+                                                                sl2Act->setFacetNormal(f2Copy->getFacetNormal());
+                                                                sl2Act->setUCN(f2Copy->getUCN());
+                                                                f2Copy = f2Copy->next;
+                                                        }
+                                                        fCopy = fCopy->next;
+                                                }
+                                                break;
+                                        }
+                                        /*End of */
                                         while(slAct!=NULL)
                                         //while(slAct!=slEndStatic->next)
@@ -2083 +2142 @@
                                                                 removalOccured=TRUE;
                                                                 slAct->isFlippable=FALSE;
-                                                                doNotAdd=TRUE;
+                                                                doNotAdd=TRUE;                                                          
                                                                 if(slAct==slHead)       //We want to delete the first element of SearchList
-                                                                {                                                               
-                                                                        slHead = slAct->next;
+                                                                {
+                                                                        deleteMarker = slHead;                          
+                                                                        slHead = slAct->next;                                           
                                                                         if(slHead!=NULL)
-                                                                                slHead->prev = NULL;
+                                                                                slHead->prev = NULL;                                    
                                                                         //set a bool flag to mark slAct as to be deleted
-                                                                }
+                                                                }//NOTE find a way to delete without affecting slAct = slAct->next
                                                                 else if(slAct==slEndStatic)
-                                                                        {
+                                                                        {                                                       
                                                                                 if(slEndStatic->next==NULL)
-                                                                                {
+                                                                                {                                                       
                                                                                         slEndStatic = slEndStatic->prev;
                                                                                         slEndStatic->next = NULL;
@@ -2108 +2168 @@
                                                                 else
                                                                 {
+                                                                        deleteMarker = slAct;
                                                                         slAct->prev->next = slAct->next;
                                                                         slAct->next->prev = slAct->prev;
                                                                 }
+                                                                
                                                                 //update lengthOfSearchList                                     
                                                                 lengthOfSearchList--;
@@ -2122 +2184 @@
                                                 }//if(!isParallel(fNormal, slNormal))
                                                 slAct = slAct->next;
+                                                delete deleteMarker;
+                                                deleteMarker=NULL;
                                                 //if slAct was marked as to be deleted, delete it here!
                                         }//while(slAct!=NULL)