Changeset f1c62d9 in git for kernel/gfan.cc

Timestamp:

Sep 29, 2009, 8:03:16 AM (15 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fda6e6ef5610f3872c7b9c6228cba279a73c792c

Parents:

873b573af6143fd5eea9143a547e8dce3faffcff

Message:

Minor changes in garbage collection


git-svn-id: file:///usr/local/Singular/svn/trunk@12138 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-09-25 13:29:10 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.89 2009-09-25 13:29:10 monerjan Exp $
-$Id: gfan.cc,v 1.89 2009-09-25 13:29:10 monerjan Exp $
+$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 $
 */
 
@@ -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)
+                        if(this!=NULL && this!=(facet *)0xfbfbfbfbfbfbfbfb)
                                 return this->UCN;
                         else
@@ -355 +355 @@
 facet::~facet()
 {
-        idDelete((ideal *)this->flipGB);
+//      idDelete((ideal *)this->flipGB);
+        delete this->fNormal;
+        delete this->interiorPoint;
+        delete this->codim2Ptr;
+        idDelete((ideal *)&this->flipGB);
         rDelete(this->flipRing);
         //this=NULL;
@@ -936 +940 @@
                                 dd_FreeMatrix(ddakt);
                                 dd_FreePolyhedra(ddpolyh);
+                                delete iv_intPoint;
                         }//while
                 }
@@ -1198 +1203 @@
                         }
                         dd_MatrixAppendTo(&intPointMatrix,posRestr);
+                        dd_FreeMatrix(posRestr);
 #ifdef gfan_DEBUG
 //                      dd_WriteMatrix(stdout,intPointMatrix);
@@ -1230 +1236 @@
                         rComplete(dstRing);                                     
                         rChangeCurrRing(dstRing);
-                        
+                        rDelete(tmpRing);
+                        delete iv_weight;
 //#ifdef gfan_DEBUG
                         rWrite(dstRing); cout << endl;
@@ -1267 +1274 @@
 //#endif                        
                         rChangeCurrRing(srcRing);       //return to the ring we started the computation of flipGB in
+                        rDelete(dstRing);
                 }//void flip(ideal gb, facet *f)
                                 
@@ -1423 +1431 @@
                 {                       
                         int lhs,rhs;
+                        bool res;
                         lhs=dotProduct(a,b)*dotProduct(a,b);
                         rhs=dotProduct(a,a)*dotProduct(b,b);
@@ -1428 +1437 @@
                         if (lhs==rhs)
                         {
-                                return TRUE;
+                                res = TRUE;
                         }
                         else
                         {
-                                return FALSE;
-                        }
+                                res = FALSE;
+                        }
+                        return res;
                 }//bool isParallel
                 
@@ -1906 +1916 @@
 #endif
                                         rChangeCurrRing(gcAct->baseRing);
+                                        rDelete(rTmp);
                                         gcPtr->next=gcTmp;
                                         gcPtr=gcPtr->next;
@@ -2143 +2154 @@
                                         slAct = slHead;
                                         notParallelCtr=0;
+//                                      delete deleteMarker;
+//                                      deleteMarker=NULL;
                                         /*If slAct==NULL and fAct!=NULL 
                                         we just copy all remaining facets into SLA*/
@@ -2274 +2287 @@
                                                                 //update lengthOfSearchList                                     
                                                                 lengthOfSearchList--;
+                                                                //delete slAct;
                                                                 //slAct = slAct->next; //not needed, since facets are equal
                                                                 //delete deleteMarker;
-                                                                deleteMarker=NULL;
+                                                                //deleteMarker=NULL;
                                                                 //fAct = fAct->next;
                                                                 break;
@@ -2306 +2320 @@
                                                 (not nice!) but since they are in seperate branches of the if-statement there should not
                                                 be a way it gets called twice thus ommiting one facet:
-                                                slAct = slAct->next;                                            
-                                                delete deleteMarker;*/
+                                                slAct = slAct->next;*/                                          
+                                                //delete deleteMarker;
                                                 deleteMarker=NULL;
                                                 //if slAct was marked as to be deleted, delete it here!