Changeset f4a2f42 in git

Timestamp:

May 8, 2009, 2:58:01 PM (15 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a2e297661483537b015225dc3602180d4df607c7

Parents:

eaa679265a6d72561ceafe956d9fe10d64554d89

Message:

Cleanup
Removed bug in declaration of isSearchFacet.


git-svn-id: file:///usr/local/Singular/svn/trunk@11784 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-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 $
+$Date: 2009-05-08 12:58:01 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.48 2009-05-08 12:58:01 monerjan Exp $
+$Id: gfan.cc,v 1.48 2009-05-08 12:58:01 monerjan Exp $
 */
 
@@ -242 +242 @@
                                 (*ivtmp)[ii]=-(*ivtmp)[ii];                             
                         }
-                        //ivtmp->show(); cout << endl;
-                        fAct->setFacetNormal(ivtmp);
-                        //fAct->printNormal();cout << endl;
-                        //ivtmp->show();cout << endl;
+                        
+                        fAct->setFacetNormal(ivtmp);                    
                 }
                 
@@ -513 +511 @@
                         std::cout << "===" << std::endl;
                         std::cout << "running gcone::flip" << std::endl;
-                        std::cout << "fNormal=";
-                        fNormal->show();
-                        std::cout << std::endl;
+//                      std::cout << "fNormal=";
+//                      fNormal->show();
+//                      std::cout << std::endl;
 #endif                          
                         /*1st step: Compute the initial ideal*/
@@ -544 +542 @@
                                         }
 #ifdef gfan_DEBUG
-                                        cout << "check=";                       
-                                        check->show();
-                                        cout << endl;
+//                                      cout << "check=";                       
+//                                      check->show();
+//                                      cout << endl;
 #endif
                                         //TODO why not *check, *fNormal????
                                         if (isParallel(*check,*fNormal)) //pass *check when 
                                         {
-                                                cout << "Parallel vector found, adding to initialFormElement" << endl;                  
+//                                              cout << "Parallel vector found, adding to initialFormElement" << endl;                  
                                                 initialFormElement[ii] = pAdd(pCopy(initialFormElement[ii]),(poly)pHead(aktpoly));
                                         }                                               
@@ -583 +581 @@
                         rChangeCurrRing(tmpRing);
                         
-                        rWrite(currRing); cout << endl;
+                        //rWrite(currRing); cout << endl;
                         
                         ideal ina;                      
@@ -595 +593 @@
                         idSkipZeroes(H);
 #ifdef gfan_DEBUG
-                        cout << "H="; idShow(H); cout << endl;
+//                      cout << "H="; idShow(H); cout << endl;
 #endif
                         /*Substep 2.2
@@ -605 +603 @@
                         srcRing_H=idrCopyR(H,tmpRing);
 #ifdef gfan_DEBUG
-                        cout << "srcRing_H = ";
-                        idShow(srcRing_H); cout << endl;
+//                      cout << "srcRing_H = ";
+//                      idShow(srcRing_H); cout << endl;
 #endif
                         srcRing_HH=ffG(srcRing_H,this->gcBasis);                
 #ifdef gfan_DEBUG
-                        cout << "srcRing_HH = ";
-                        idShow(srcRing_HH); cout << endl;
+//                      cout << "srcRing_HH = ";
+//                      idShow(srcRing_HH); cout << endl;
 #endif
                         /*Substep 2.2.1
@@ -770 +768 @@
                         //validOpts<1>=TRUE;
 #ifdef gfan_DEBUG
-                        idShow(dstRing_I);
+                        //idShow(dstRing_I);
 #endif                  
                         BITSET save=test;
@@ -800 +798 @@
                         cout << "Entering restOfDiv" << endl;
                         poly p=f;
-                        pWrite(p);
+                        //pWrite(p);
                         //poly r=kCreateZeroPoly(,currRing,currRing);   //The 0-polynomial, hopefully
                         poly r=NULL;    //The zero polynomial
@@ -825 +823 @@
                                                 pSort(step3); //must be here, otherwise strange behaviour with many +o+o+o+o+ terms
                                                 p=step3;
-                                                pWrite(p);                                              
+                                                //pWrite(p);                                            
                                                 divOccured=TRUE;
                                         }
@@ -875 +873 @@
                                 //pSort(res->m[ii]);
                                 //pSetm(res->m[ii]);
-                                cout << "res->m["<<ii<<"]=";pWrite(res->m[ii]);                                         
+                                //cout << "res->m["<<ii<<"]=";pWrite(res->m[ii]);                                               
                         }                       
                         return res;
@@ -936 +934 @@
                         lhs=dotProduct(a,b)*dotProduct(a,b);
                         rhs=dotProduct(a,a)*dotProduct(b,b);
-                        cout << "LHS="<<lhs<<", RHS="<<rhs<<endl;
+                        //cout << "LHS="<<lhs<<", RHS="<<rhs<<endl;
                         if (lhs==rhs)
                         {
@@ -1102 +1100 @@
                 * If this is the case, then our facet is indeed a search facet and TRUE is retuned. 
                 */
-                bool isSearchFacet(gcone &gcTmp, facet &testfacet)
+                bool isSearchFacet(gcone &gcTmp, facet *testfacet)
                 {                               
                         ring actRing=currRing;
@@ -1164 +1162 @@
                                         fMin=fCmp;
                                         fAct=fMin;
+                                        fCmp=fCmp->next;
                                 }
                                 else
@@ -1182 +1181 @@
                         
                         /*If testfacet was minimal then fMin should still point there */
-                        //NOTE BUG: Comment in and -> out of memory error
-                        /*intvec *alpha_min = new intvec(this->numVars);
-                        alpha_min=fMin->getFacetNormal();
-                        delete fCmp,fAct,fMin;
-                        
-                        intvec *test = new intvec(this->numVars);
-                        test=testfacet.getFacetNormal();*/
-                        //if(fMin->getFacetNormal()==ivNeg(testfacet.getFacetNormal()))
-                        //if (isParallel(fMin->getFacetNormal(),testfacet.getFacetNormal()))
+                        
+                        //if(fMin->getFacetNormal()==ivNeg(testfacet.getFacetNormal()))                 
+#ifdef gfan_DEBUG
+                        cout << "Checking for parallelity" << endl <<" fMin is";
                         fMin->printNormal();
-                        testfacet.printNormal();  //NOTE THIS IS EMPTY, so prolly cause of bug above
+                        cout << "testfacet is ";
+                        testfacet->printNormal();
+                        cout << endl;
+#endif
                         if (fMin==gcTmp.facetPtr)                       
                         //if(areEqual(fMin->getFacetNormal(),ivNeg(testfacet.getFacetNormal())))
+                        //if (isParallel(fMin->getFacetNormal(),testfacet->getFacetNormal()))
                         {                               
                                 cout << "Parallel" << endl;
@@ -1247 +1245 @@
                                 gcTmp->showIntPoint();
                                 /*recursive part goes gere*/
-                                if (isSearchFacet(*gcTmp,(facet&)gcAct->facetPtr))
+                                if (isSearchFacet(*gcTmp,(facet*)gcAct->facetPtr))
                                 {
                                         gcAct->next=gcTmp;
@@ -1283 +1281 @@
         */
         
-        /* Construct a new ring which will serve as our root
-        Does not yet work as expected. Will work fine with order dp,Dp but otherwise hangs in getGB
-        resolved 07.04.2009 MM
-        */
+        /* Construct a new ring which will serve as our root*/
         rootRing=rCopy0(currRing);
         rootRing->order[0]=ringorder_lp;
-        //NOTE: Build ring accordiing to rCopyAndChangeWeight
-        /*rootRing->order[0]=ringorder_a;
-        rootRing->order[1]=ringorder_lp;
-        rootRing->wvhdl[0] =( int *)omAlloc(numvar*sizeof(int));
-        rootRing->wvhdl[0][1]=1;
-        rootRing->wvhdl[0][2]=1;*/
+        
         rComplete(rootRing);
         rChangeCurrRing(rootRing);