Changeset 631b6c8 in git for kernel/gfan.cc

Timestamp:

Nov 20, 2009, 8:22:09 AM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9cb5303e515b049b81024ab68de6bfe2f04dc1c0

Parents:

b45f5838c39df9ba8d37bf5f6d5ceec98e8bc166

Message:

gcone::getUCN


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

File:

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

kernel/gfan.cc

@@ -80 +80 @@
                 
 /** \brief The default constructor for facets
-* Do I need a constructor of type facet(intvec)? 
 */
 facet::facet()                  
@@ -246 +245 @@
 int facet::getUCN()
 {
-        if(this!=NULL && ( this!=(facet *)0xfbfbfbfb || this!=(facet *)0xfbfbfbfbfbfbfbfb) )
+        if(this!=NULL && ( this!=(facet *)0xfbfbfbfb || this!=(facet *)0xfbfbfbfbfbfbfbfb) )
+//      if(this!=NULL && ( this->fNormal!=(intvec *)0xfbfbfbfb || this->fNormal!=(intvec *)0xfbfbfbfbfbfbfbfb) )
                 return this->UCN;
         else
@@ -2163 +2163 @@
                                 else    //fN and slN are parallel
                                 {
-                                                        //We check whether the codim-2-facets coincide
+                                        //We check whether the codim-2-facets coincide
                                         codim2Act = fAct->codim2Ptr;
                                         ctr=0;
@@ -2198 +2198 @@
                                                         slHead = slAct->next;                                           
                                                         if(slHead!=NULL)
-                                                                slHead->prev = NULL;                                    
+                                                                slHead->prev = NULL;
+                                                        /*delete deleteMarker*/;                                        
                                                                         //set a bool flag to mark slAct as to be deleted
                                                 }//NOTE find a way to delete without affecting slAct = slAct->next
@@ -2230 +2231 @@
                                                 //slAct=NULL;
                                                 //slAct = slAct->next; //not needed, since facets are equal
-                                                //delete deleteMarker;
+//                                              delete deleteMarker;
                                                 //deleteMarker=NULL;
                                                 //fAct = fAct->next;