Changeset f07b38c in git

Timestamp:

Nov 23, 2009, 3:15:52 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

d945f30c526b2f3c4c937f5acb82e282284898d9

Parents:

cef1fb8a6b684adbc201e50f3ee51a42e97ee1f6

Message:

~gcone
No more output by default
gcTmp->gcBasis->m[ii]=(poly)NULL;
repaired creation of polys with rational coeffs


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

Location:

kernel

Files:

• gfan.cc (modified) (16 diffs)
• gfan.h (modified) (1 diff)

kernel/gfan.cc

@@ -64 +64 @@
 
 #ifndef gfan_DEBUG
-//#define gfan_DEBUG
+// #define gfan_DEBUG 1
 #ifndef gfan_DEBUGLEVEL
 #define gfan_DEBUGLEVEL 1
@@ -377 +377 @@
 //      if (this->rootRing!=NULL && this->rootRing!=(ip_sring *)0xfefefefefefefefe)
 //              rDelete(this->rootRing);
-        //rDelete(this->baseRing);
+//      if(this->UCN!=1)
+//              rDelete(this->baseRing);
         facet *fAct;
         facet *fDel;
@@ -389 +390 @@
                 delete fDel;
         }
+        this->counter--;
+        dd_FreeMatrix(this->ddFacets);
         //dd_FreeMatrix(this->ddFacets);
 }                       
@@ -447 +450 @@
                 
 /** For debugging purposes only */
-void gcone::showSLA(facet &f)
+volatile void gcone::showSLA(facet &f)
 {
         facet *fAct;
@@ -952 +955 @@
         fNormal = f->getFacetNormal();  //read this->fNormal;
 
-        std::cout << "running gcone::flip" << std::endl;
-        std::cout << "flipping UCN " << this->getUCN() << endl;
-        cout << "over facet (";
-        fNormal->show(1,0);
-        cout << ") with UCN " << f->getUCN();
-        std::cout << std::endl;
+//      std::cout << "running gcone::flip" << std::endl;
+//      std::cout << "flipping UCN " << this->getUCN() << endl;
+//      cout << "over facet (";
+//      fNormal->show(1,0);
+//      cout << ") with UCN " << f->getUCN();
+//      std::cout << std::endl;
 
         /*1st step: Compute the initial ideal*/
@@ -1216 +1219 @@
         f->flipRing=rCopy(dstRing);     //store the ring on the other side
 //#ifdef gfan_DEBUG
-        cout << "Flipped GB is UCN " << counter+1 << ":" << endl;
+//      cout << "Flipped GB is UCN " << counter+1 << ":" << endl;
 //      this->idDebugPrint(dstRing_I);
 //      cout << endl;
@@ -1723 +1726 @@
                         gcTmp->showFacets(1);
 #endif
+                        /*add facets to SLA here*/
+                        SearchListRoot=gcTmp->enqueueNewFacets(*SearchListRoot);
+                        
                         if(gfanHeuristic==1)
                         {
                                 gcTmp->writeConeToFile(*gcTmp);
+//                              idDelete((ideal*)&gcTmp->gcBasis);
+                                for(int ii=0;ii<IDELEMS(gcTmp->gcBasis);ii++)
+                                {
+                                        gcTmp->gcBasis->m[ii]=(poly)NULL;
+                                }
                         }
-                        /*add facets to SLA here*/
-                        SearchListRoot=gcTmp->enqueueNewFacets(*SearchListRoot);
-#ifdef gfan_DEBUG
+                        
+#if gfan_DEBUG
                         if(SearchListRoot!=NULL)
                                 gcTmp->showSLA(*SearchListRoot);
@@ -1766 +1776 @@
                                 {
                                         deleteMarker = gcHead;
-                                        gcHead = gcNext->next;
+//                                      gcHead = gcNext->next;
                                         //gcNext->next->prev = NULL;
                                 }
@@ -1772 +1782 @@
                                 {
                                         deleteMarker = gcNext;
-                                        gcNext->prev->next = gcNext->next;
-                                        gcNext->next->prev = gcNext->prev;
+//                                      gcNext->prev->next = gcNext->next;
+//                                      gcNext->next->prev = gcNext->prev;
                                 }
 //                              gcNext = gcNext->next;
@@ -1794 +1804 @@
                                         gcAct = gcNext;
                                         //implant the GB into gcAct
-                                        readConeFromFile(gcNext->getUCN(), gcAct);
+                                        readConeFromFile(gcAct->getUCN(), gcAct);
                                         rAct=rCopy(gcAct->baseRing);
                                         rComplete(rAct);
@@ -2453 +2463 @@
                                 while(!line.empty())
                                 {
+//                                      resPoly=pInit();
+//                                      strPoly=pInit();
                                         hasNegCoeff = FALSE;
+                                        hasCoeffInQ = FALSE;
                                         found = line.find_first_of("+-");       //get the first monomial
                                         string tmp;
@@ -2473 +2486 @@
                                                 hasCoeffInQ = TRUE;
                                                 strCoeffNom=strMonom.substr(0,found);                                           
-                                                strCoeffDenom=strMonom.substr(found+1,strMonom.find_first_not_of("1234567890"));
+                                                strCoeffDenom=strMonom.substr(found+1,strMonom.find_first_not_of("1234567890",found+1));
                                                 strMonom.erase(0,found);
                                                 strMonom.erase(0,strMonom.find_first_not_of("1234567890/"));                    
@@ -2541 +2554 @@
                                 }//while(!line.empty())         
                         
-                                gcBasis->m[jj]=pCopy(resPoly);
+                                gc->gcBasis->m[jj]=pCopy(resPoly);
                                 resPoly=NULL;   //reset
                         }
@@ -2586 +2599 @@
                 l->m[0].data=(void*)gcAct->getUCN();
                 l->m[1].rtyp=IDEAL_CMD;
+                /*The following is necessary for leaves in the tree of cones
+                * Since we don't use them in the computation and gcBasis is 
+                * set to (poly)NULL in noRevS we need to get this back here.
+                */
+                if(gcAct->gcBasis->m[0]==(poly)NULL)
+                        gcAct->readConeFromFile(gcAct->getUCN(),gcAct);
                 l->m[1].data=(void*)idrCopyR_NoSort(gcAct->gcBasis,gcAct->getBaseRing());
-                
+
                 l->m[2].rtyp=INTVEC_CMD;
                 intvec iv=(gcAct->f2M(gcAct,gcAct->facetPtr));
@@ -2717 +2736 @@
                 res = inputIdeal; 
                 lResList=lprepareResult(gcRoot,gcRoot->getCounter());
-//              res=lResList;
+                /*Cleanup*/
+                gcone *gcDel;   
+                gcDel = gcRoot;
+                gcAct = gcRoot;
+                do
+                {
+                        gcDel = gcAct;
+                        gcAct = gcAct->next;
+                        delete gcDel;
+                }while(gcAct!=NULL);
         }
         dd_free_global_constants();
@@ -2730 +2758 @@
         }
         
+        /*Return result*/
         return lResList;
 }

kernel/gfan.h

@@ -165 +165 @@
                 int getPredUCN();               
                 void showFacets(short codim=1);
-                void showSLA(facet &f);
+                volatile void showSLA(facet &f);
                 void idDebugPrint(ideal const &I);
                 void invPrint(ideal const &I);