Changeset eaa679 in git

Timestamp:

May 7, 2009, 11:55:48 AM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

f4a2f423453c2ac5708a5092a552d99d9ae6dc42

Parents:

f16a76d72e29ae88bdd1b8cd60bff79fb200f3cd

Message:

Some cleanup
Fixed yesterday's bug that was caused by omitting to reverse the facet normal
method ivNeg to reverse intvecs
Traced down bug in isSearchFacet. Namely testfacet seems to be strangely empty;
additionally it seems the "mininmal" facet is not yet found correctly


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-05-06 09:54:23 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.46 2009-05-06 09:54:23 monerjan Exp $
-$Id: gfan.cc,v 1.46 2009-05-06 09:54:23 monerjan Exp $
+$Date: 2009-05-07 09:55:48 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.47 2009-05-07 09:55:48 monerjan Exp $
+$Id: gfan.cc,v 1.47 2009-05-07 09:55:48 monerjan Exp $
 */
 
@@ -14 +14 @@
 #include "kutil.h"
 #include "intvec.h"
-#include "int64vec.h"
 #include "polys.h"
 #include "ideals.h"
@@ -443 +442 @@
                                 }//for (int jj = 1; jj <ddcols; jj++)
                                 /*Quick'n'dirty hack for flippability*/ 
-                                bool isFlippable=FALSE;
-                                //NOTE BUG HERE
-                                /* The flippability check is wrong!
-                                (1,-4) will pass, but (-1,7) will not. 
-                                REWRITE THIS
-                                */                      
-                                /*for (int jj = 0; jj<this->numVars; jj++)
-                                {                                       
-                                        intvec *ivCanonical = new intvec(this->numVars);
-                                        (*ivCanonical)[jj]=1;                                   
-                                        if (dotProduct(load,ivCanonical)>=0)
-                                        {
-                                                isFlippable=FALSE;                                              
-                                        }
-                                        else
-                                        {
-                                                isFlippable=TRUE;
-                                        }                                       
-                                        delete ivCanonical;
-                                }//for (int jj = 0; jj<this->numVars; jj++)
-                                */      
+                                bool isFlippable=FALSE;                         
                                 for (int jj = 0; jj<load->length(); jj++)
                                 {
@@ -483 +462 @@
                                 {       /*Now load should be full and we can call setFacetNormal*/
                                         fAct->setFacetNormal(load);
-                                        fAct->next = new facet();
-                                        //fAct->printNormal();
+                                        fAct->next = new facet();                                       
                                         fAct=fAct->next;        //this should definitely not be called in the above while-loop :D
                                 }//if (isFlippable==FALSE)
@@ -584 +562 @@
                                 /*Now initialFormElement must be added to (ideal)initialForm */
                                 initialForm->m[ii]=initialFormElement[ii];
-                        }//for
-                        //f->setFlipGB(initialForm);    //FIXME PROBABLY WRONG TO STORE HERE SINCE INA!=flibGB                  
+                        }//for                  
 #ifdef gfan_DEBUG
                         cout << "Initial ideal is: " << endl;
@@ -592 +569 @@
                         cout << "===" << endl;
 #endif
-                        delete check;
+                        //delete check;
                         
                         /*2nd step: lift initial ideal to a GB of the neighbouring cone using minus alpha as weight*/
@@ -601 +578 @@
                         ring srcRing=currRing;
 
-                        ring tmpRing=rCopyAndAddWeight(srcRing,fNormal);
+                        //intvec *negfNormal = new intvec(this->numVars);
+                        //negfNormal=ivNeg(fNormal);
+                        ring tmpRing=rCopyAndAddWeight(srcRing,ivNeg(fNormal));
                         rChangeCurrRing(tmpRing);
                         
@@ -612 +591 @@
                         idShow(ina); cout << endl;
 #endif
-                        ideal H;  //NOTE WTF? rCopyAndAddWeight does not seem to be compatible with kStd... => wrong result!
+                        ideal H;
                         H=kStd(ina,NULL,isHomog,NULL);  //we know it is homogeneous
                         idSkipZeroes(H);
@@ -921 +900 @@
                 {
                 }//GGW
+                
+                intvec *ivNeg(intvec const &iv)
+                {
+                        intvec *res = new intvec(this->numVars);
+                        for(int ii=0;ii<this->numVars;ii++)
+                        {
+                                res[ii] = -(int)iv[ii];
+                        }
+                        return res;
+                }
 
 
@@ -1191 +1180 @@
                         }//while(fAct.facetPtr->next!=NULL)
                         delete alpha_i,alpha_j,sigma;
+                        
                         /*If testfacet was minimal then fMin should still point there */
                         //NOTE BUG: Comment in and -> out of memory error
@@ -1198 +1188 @@
                         
                         intvec *test = new intvec(this->numVars);
-                        test=testfacet.getFacetNormal();                        
-                        
-                        if (isParallel(alpha_min,test))*/
-                        if (fMin==gcTmp.facetPtr)
-                        {
+                        test=testfacet.getFacetNormal();*/
+                        //if(fMin->getFacetNormal()==ivNeg(testfacet.getFacetNormal()))
+                        //if (isParallel(fMin->getFacetNormal(),testfacet.getFacetNormal()))
+                        fMin->printNormal();
+                        testfacet.printNormal();  //NOTE THIS IS EMPTY, so prolly cause of bug above
+                        if (fMin==gcTmp.facetPtr)                       
+                        //if(areEqual(fMin->getFacetNormal(),ivNeg(testfacet.getFacetNormal())))
+                        {                               
+                                cout << "Parallel" << endl;
                                 rChangeCurrRing(actRing);
+                                //delete alpha_min, test;
                                 return TRUE;
                         }
                         else 
                         {
+                                cout << "Not parallel" << endl;
                                 rChangeCurrRing(actRing);
+                                //delete alpha_min, test;
                                 return FALSE;
                         }
                 }//bool isSearchFacet
+                
+                bool areEqual(intvec const &a, intvec const &b)
+                {
+                        bool res=TRUE;
+                        for(int ii=0;ii<this->numVars;ii++)
+                        {
+                                if(a[ii]!=b[ii])
+                                {
+                                        res=FALSE;
+                                        break;
+                                }
+                        }
+                        return res;
+                }
                 
                 void reverseSearch(gcone *gcAct) //no const possible here since we call gcAct->flip
@@ -1223 +1234 @@
                                 gcAct->flip(gcAct->gcBasis,gcAct->facetPtr);
                                 gcone *gcTmp = new gcone(*gcAct);
-                                idShow(gcTmp->gcBasis);
+                                //idShow(gcTmp->gcBasis);
                                 gcTmp->getConeNormals(gcTmp->gcBasis, TRUE);
 #ifdef gfan_DEBUG
@@ -1308 +1319 @@
         idShow(gcAct->gcBasis);
         gcAct->getConeNormals(gcAct->gcBasis);  //hopefully compute the normals 
-        gcAct->flip(gcAct->gcBasis,gcAct->facetPtr);    
+        //gcAct->flip(gcAct->gcBasis,gcAct->facetPtr);  
         /*Now it is time to compute the search facets, respectively start the reverse search.
         But since we are in the root all facets should be search facets. IS THIS TRUE?
@@ -1324 +1335 @@
                 fAct = fAct->next;              
         }*/
-        //gcAct->reverseSearch(gcAct);
+        gcAct->reverseSearch(gcAct);
+        
         /*As of now extra.cc expects gfan to return type ideal. Probably this will change in near future.
         The return type will then be of type LIST_CMD