Changeset d4f1b95 in git for kernel/gfan.cc

Timestamp:

Nov 24, 2009, 10:19:36 AM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '873fc1222e995d7cb33f79d8f1792ce418c8c72c')

Children:

ceaa049b15f01877c8cd64ac61771aff342c1da7

Parents:

d945f30c526b2f3c4c937f5acb82e282284898d9

Message:

Copy constructor for facets
pDelete



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

File:

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

kernel/gfan.cc

@@ -126 +126 @@
 facet::facet(const facet& f)
 {
+//      this->setFacetNormal(f.getFacetNormal());
+//      this->setUCN(f.getUCN());
+//      this->isFlippable=f.isFlippable;
+//      facet* f2Copy;
+//      f2Copy=f.codim2Ptr;
+//      facet* f2Act;
+//      f2Act=this->codim2Ptr;
+//      while(f2Copy!=NULL)
+//      {
+//              if(f2Act==NULL)
+//              {
+//                      f2Act=new facet(2);                     
+//              }
+//              else
+//              {
+//                      f2Act->next = new facet(2);
+//              }
+//              f2Act->setFacetNormal(f2Copy->getFacetNormal());
+//              f2Copy = f2Copy->next;
+//      }
 }
                 
@@ -220 +240 @@
 }
                 
-/** Return the flipped GB*/
+/** Return the flipped GB
+Seems not be used
+Anyhow idCopy would make sense here.
+*/
 ideal facet::getFlipGB()
 {
@@ -245 +268 @@
 int facet::getUCN()
 {
-        if(this!=NULL && ( this!=(facet *)0xfbfbfbfb || this!=(facet *)0xfbfbfbfbfbfbfbfb) )
+        if(this!=NULL  && this!=(facet *)0xfbfbfbfbfbfbfbfb)// || this!=(facet *)0xfbfbfbfb) )
 //      if(this!=NULL && ( this->fNormal!=(intvec *)0xfbfbfbfb || this->fNormal!=(intvec *)0xfbfbfbfbfbfbfbfb) )
                 return this->UCN;
@@ -409 +432 @@
 intvec *gcone::getIntPoint()
 {
-        return this->ivIntPt;
+        return ivCopy(this->ivIntPt);
 }
                 
@@ -1724 +1747 @@
                         gcTmp->normalize();
 #ifdef gfan_DEBUG
-                        gcTmp->showFacets(1);
+//                      gcTmp->showFacets(1);
 #endif
                         /*add facets to SLA here*/
@@ -1735 +1758 @@
                                 for(int ii=0;ii<IDELEMS(gcTmp->gcBasis);ii++)
                                 {
-                                        gcTmp->gcBasis->m[ii]=(poly)NULL;
+//                                      gcTmp->gcBasis->m[ii]=(poly)NULL;
+                                        pDelete(&gcTmp->gcBasis->m[ii]);
                                 }
                         }
                         
 #if gfan_DEBUG
-                        if(SearchListRoot!=NULL)
-                                gcTmp->showSLA(*SearchListRoot);
+//                      if(SearchListRoot!=NULL)
+//                              gcTmp->showSLA(*SearchListRoot);
 #endif
                         rChangeCurrRing(gcAct->baseRing);
@@ -1988 +2012 @@
         slEndStatic = slEnd;
         /*1st step: compare facetNormals*/
-        intvec *fNormal=NULL; //= new intvec(this->numVars);
-        intvec *f2Normal=NULL; //= new intvec(this->numVars);
-        intvec *slNormal=NULL; //= new intvec(this->numVars);
-        intvec *sl2Normal=NULL; //= new intvec(this->numVars);
+        intvec *fNormal=NULL;
+        intvec *f2Normal=NULL;
+        intvec *slNormal=NULL;
+        intvec *sl2Normal=NULL;
                         
         while(fAct!=NULL)
@@ -2055 +2079 @@
                                         //while(slAct!=slEndStatic->next)
                         {
-//                              if(deleteMarker!=NULL)
-//                              {
+                                if(deleteMarker!=NULL)
+                                {
 //                                      delete deleteMarker;
 //                                      deleteMarker=NULL;
-//                              }
+                                }
                                 removalOccured=FALSE;
                                 slNormal = slAct->getFacetNormal();
@@ -2072 +2096 @@
                                 {
                                         notParallelCtr++;
-//                                                      slAct = slAct->next;
                                 }
                                 else    //fN and slN are parallel
@@ -2108 +2131 @@
                                                 if(slAct==slHead)       //We want to delete the first element of SearchList
                                                 {
-                                                        deleteMarker = slHead;                          
+                                                        deleteMarker = slAct;                           
                                                         slHead = slAct->next;                                           
                                                         if(slHead!=NULL)
                                                                 slHead->prev = NULL;
-                                                        /*delete deleteMarker*/;                                        
-                                                                        //set a bool flag to mark slAct as to be deleted
+//                                                      delete deleteMarker; deleteMarker=NULL;
+                                                        //set a bool flag to mark slAct as to be deleted
                                                 }//NOTE find a way to delete without affecting slAct = slAct->next
                                                 else if(slAct==slEndStatic)
@@ -2129 +2152 @@
                                                                 slEndStatic->next->prev = slEndStatic->prev;
                                                                 slEndStatic = slEndStatic->prev;
-                                                                                        //slEnd = slEndStatic;
+                                                                //slEnd = slEndStatic;
                                                         }
                                                 }                                                               
@@ -2137 +2160 @@
                                                         slAct->prev->next = slAct->next;
                                                         slAct->next->prev = slAct->prev;
-                                                }
-                                                                
+                                                }                                                               
                                                 //update lengthOfSearchList                                     
-                                                lengthOfSearchList--;
-                                                //delete slAct;
-                                                //slAct=NULL;
-                                                //slAct = slAct->next; //not needed, since facets are equal
-//                                              delete deleteMarker;
-                                                //deleteMarker=NULL;
-                                                //fAct = fAct->next;
+                                                lengthOfSearchList--;                                           
                                                 break;
                                         }//if(ctr==fAct->numCodim2Facets)
@@ -2152 +2168 @@
                                                 //is no other facet later in SLA that might be equal.
                                         {
-                                                maybe=TRUE;
-//                                                                      if(slAct->next==NULL && maybe==TRUE)
-//                                                                      {
-//                                                                      doNotAdd=FALSE;
-//                                                                      slAct = slAct->next;
-//                                                                      break;
-//                                                                      }
-//                                                                      else
-//                                                                      slAct=slAct->next;
-                                        }
-                                                        //slAct = slAct->next;
-                                                        //delete deleteMarker;                                                  
+                                                maybe=TRUE;//                                                                   
+                                        }                                                       
                                 }//if(!isParallel(fNormal, slNormal))
                                 if( (slAct->next==NULL) && (maybe==TRUE) )
@@ -2176 +2182 @@
                                 be a way it gets called twice thus ommiting one facet:
                                 slAct = slAct->next;*/                                          
-                                                //delete deleteMarker;
-                                                //deleteMarker=NULL;
+//                                              delete deleteMarker;
+//                                              deleteMarker=NULL;
                                                 //if slAct was marked as to be deleted, delete it here!
                         }//while(slAct!=NULL)                                                                   
@@ -2206 +2212 @@
                                 slEnd->prev = marker;
                                 //Copy codim2-facets
-                                intvec *f2Normal;// = new intvec(this->numVars);
+                                intvec *f2Normal;
                                 while(f2Act!=NULL)
                                 {
@@ -2235 +2241 @@
         }//while(fAct!=NULL)                                            
         return slHead;
-//                      delete sl2Normal;
-//                      delete slNormal;
-//                      delete f2Normal;
-//                      delete fNormal;
 }//addC2N
                 
@@ -2574 +2576 @@
 ring gcone::getBaseRing()
 {
-        return this->baseRing;
+        return rCopy(this->baseRing);
 }
 /** \brief Gather the output
@@ -2740 +2742 @@
                 gcDel = gcRoot;
                 gcAct = gcRoot;
-                do
+                while(gcAct!=NULL)
                 {
                         gcDel = gcAct;
                         gcAct = gcAct->next;
                         delete gcDel;
-                }while(gcAct!=NULL);
+                }
         }
         dd_free_global_constants();