Changeset 4042c2 in git for kernel

Timestamp:

Oct 1, 2009, 8:36:23 AM (15 years ago)

Author:

Martin Monerjan

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

ac6e45db1f490e638b067d932fc2c4100bc9526c

Parents:

a51188ce7774d67642def70c783997021d31d082

Message:

Cleanup in normalize, makeInt, dotProduct, ivNeg and isFlippable
Changed facet->getUCN to hopefully honor 32/64 bit


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-09-29 06:03:16 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.90 2009-09-29 06:03:16 monerjan Exp $
-$Id: gfan.cc,v 1.90 2009-09-29 06:03:16 monerjan Exp $
+$Date: 2009-10-01 06:36:23 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.91 2009-10-01 06:36:23 monerjan Exp $
+$Id: gfan.cc,v 1.91 2009-10-01 06:36:23 monerjan Exp $
 */
 
@@ -60 +60 @@
 
 #ifndef gfan_DEBUG
-//#define gfan_DEBUG
+#define gfan_DEBUG
 #ifndef gfan_DEBUGLEVEL
 #define gfan_DEBUGLEVEL 1
@@ -255 +255 @@
                 int getUCN()
                 {
-                        if(this!=NULL && this!=(facet *)0xfbfbfbfbfbfbfbfb)
+                        if(this!=NULL && ( this!=0xfbfbfbfb || this!=(facet *)0xfbfbfbfbfbfbfbfb) )
                                 return this->UCN;
                         else
@@ -309 +309 @@
                         }
                         cout << "=======================" << endl;
-                }
-                
-                /*bool isFlippable(intvec &load)
-                {
-                        bool res=TRUE;                  
-                        int jj;
-                        for (int jj = 0; jj<load.length(); jj++)
-                        {
-                                intvec *ivCanonical = new intvec(load.length());
-                                (*ivCanonical)[jj]=1;                           
-                                if (ivMult(&load,ivCanonical)<0)
-                                {
-                                        res=FALSE;
-                                        break;
-                                }
-                        }
-                        return res;
-                        
-                        /*while (dotProduct(load,ivCanonical)>=0)
-                        {
-                                if (jj!=this->numVars)
-                                {
-                                        intvec *ivCanonical = new intvec(this->numVars);
-                                        (*ivCanonical)[jj]=1;                   
-                                        res=TRUE;
-                                        jj += 1;
-                                } 
-                        }
-                        if (jj==this->numVars)
-                        {                       
-                                delete ivCanonical;
-                                return FALSE;
-                        }
-                        else
-                        {
-                                delete ivCanonical;
-                                return TRUE;
-                }*/                                             
-                //}//bool isFlippable(facet &f)
-                
+                }               
                 
                 friend class gcone;     //Bad style
@@ -1236 +1197 @@
                         rComplete(dstRing);                                     
                         rChangeCurrRing(dstRing);
-                        rDelete(tmpRing);
+                        //rDelete(tmpRing);
                         delete iv_weight;
 //#ifdef gfan_DEBUG
@@ -1274 +1235 @@
 //#endif                        
                         rChangeCurrRing(srcRing);       //return to the ring we started the computation of flipGB in
-                        rDelete(dstRing);
+//                      rDelete(dstRing);
                 }//void flip(ideal gb, facet *f)
                                 
@@ -1399 +1360 @@
                         intvec *res = new intvec(iv->length());
                         res=ivCopy(iv);
-                        *res *= (int)-1;
-                        //for(int ii=0;ii<this->numVars;ii++)
-                        //{                     
-                                //(res)[ii] = (*res[ii])*(int)(-1);
-                        //}
-                        //res->show(1,0);                       
+                        *res *= (int)-1;                                                
                         return res;
                 }
@@ -1413 +1369 @@
                 */
                 int dotProduct(intvec const &iva, intvec const &ivb)                            
-                {
-                        //intvec iva=a;
-                        //intvec ivb=b;
+                {                       
                         int res=0;
                         for (int i=0;i<this->numVars;i++)
@@ -1890 +1844 @@
                         We always choose the first facet from fListPtr as facet to be flipped
                         */                      
-                        while((SearchListAct!=NULL))// && counter<160)
+                        while((SearchListAct!=NULL))// && counter<10)
                         {//NOTE See to it that the cone is only changed after ALL facets have been flipped!                             
                                 fAct = SearchListAct;
-                                //while( ( (fAct->next!=NULL) && (fAct->getUCN()==fAct->next->getUCN() ) ) )
-                                //do
+                                
                                 while(fAct!=NULL)
                                 {       //Since SLA should only contain flippables there should be no need to check for that
@@ -1916 +1869 @@
 #endif
                                         rChangeCurrRing(gcAct->baseRing);
-                                        rDelete(rTmp);
+                                        //rDelete(rTmp);
                                         gcPtr->next=gcTmp;
                                         gcPtr=gcPtr->next;
@@ -1986 +1939 @@
                                 mpz_clear(z);                           
                         }
-                        
-                        //Check whether denom is all ones, in which case we will divide out the gcd of the nominators
-//                      mpz_t checksum; mpz_t rop;
-//                      mpz_init(checksum);
-//                      mpz_init(rop);
-//                      bool divideOutGcd=FALSE;
-//                      for(int ii=0;ii<this->numVars;ii++)
-//                      {
-//                              mpz_add(rop, checksum, denom[ii]);
-//                              mpz_set(checksum, rop);
-//                      }
-//                      if( (int)mpz_get_ui(checksum)==this->numVars)
-//                      {
-//                              divideOutGcd=TRUE;
-//                      }
-                        
+                                                
                         /*Compute lcm of the denominators*/
                         mpz_set(tmp,denom[0]);
@@ -2066 +2004 @@
                                 fAct = fAct->next;
                         }
-                
-                        //delete n;
-                        /*codim2Act = this->facetPtr->codim2Ptr;        //reset to start of linked list                 
-                        while(codim2Act!=NULL)
-                        {                               
-                                n=codim2Act->getFacetNormal();
-                                intvec *new_n = new intvec(this->numVars);
-                                for(int ii=0;ii<this->numVars;ii++)
-                                {
-                                        (*new_n)[ii] = (*n)[ii]*ggT;
-                                }
-                                codim2Act->setFacetNormal(new_n);
-                                codim2Act = codim2Act->next;
-                                //delete n;
-                                //delete new_n;
-                        }       */              
+                                
                 }
                 /** \brief Enqueue new facets into the searchlist 
@@ -2207 +2130 @@
                                         //while(slAct!=slEndStatic->next)
                                         {
+//                                              if(deleteMarker!=NULL)
+//                                              {
+//                                                      delete deleteMarker;
+//                                                      deleteMarker=NULL;
+//                                              }
                                                 removalOccured=FALSE;
                                                 slNormal = slAct->getFacetNormal();
@@ -2288 +2216 @@
                                                                 lengthOfSearchList--;
                                                                 //delete slAct;
+                                                                //slAct=NULL;
                                                                 //slAct = slAct->next; //not needed, since facets are equal
                                                                 //delete deleteMarker;
@@ -2322 +2251 @@
                                                 slAct = slAct->next;*/                                          
                                                 //delete deleteMarker;
-                                                deleteMarker=NULL;
+                                                //deleteMarker=NULL;
                                                 //if slAct was marked as to be deleted, delete it here!
                                         }//while(slAct!=NULL)