Changeset 110e721 in git for kernel/gfan.cc

Timestamp:

Dec 4, 2009, 1:17:19 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1a68d1d2c26c94af9b8ee4cf98aad93763403437

Parents:

60eb1ddb931cc15fe0ad0a8376dc9a7b83de0508

Message:

const parameters
0xfb checks removed


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

File:

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

kernel/gfan.cc

@@ -17 +17 @@
 #include "ideals.h"
 #include "kmatrix.h"
-#include "fast_maps.h"  //Mapping of ideals
+//#include "fast_maps.h"        //Mapping of ideals
 #include "maps.h"
 #include "ring.h"
@@ -149 +149 @@
                         f2Act->prev = marker;
                 }
-                f2Act->setFacetNormal(f2Copy->getFacetNormal());
+                intvec *f2Normal;
+                f2Normal = f2Copy->getFacetNormal();
+//              f2Act->setFacetNormal(f2Copy->getFacetNormal());
+                f2Act->setFacetNormal(f2Normal);
+                delete f2Normal;
                 f2Act->setUCN(f2Copy->getUCN());
                 f2Copy = f2Copy->next;
@@ -181 +185 @@
                 idDelete((ideal *)&this->flipGB);
         if(this->flipRing!=NULL && this->flipRing->idroot!=(idhdl)0xfbfbfbfbfbfbfbfb)
-                rDelete(this->flipRing);
+//              rDelete(this->flipRing);
 //      this->flipRing=NULL;
         this->prev=NULL;
@@ -288 +292 @@
 int facet::getUCN()
 {
-        if(this!=NULL  && this!=(facet *)0xfbfbfbfbfbfbfbfb)// || this!=(facet *)0xfbfbfbfb) )
+        if(this!=NULL)//  && this!=(facet *)0xfbfbfbfbfbfbfbfb)// || this!=(facet *)0xfbfbfbfb) )
 //      if(this!=NULL && ( this->fNormal!=(intvec *)0xfbfbfbfb || this->fNormal!=(intvec *)0xfbfbfbfbfbfbfbfb) )
                 return this->UCN;
@@ -584 +588 @@
 int gcone::getUCN()
 {
-        if( this!=NULL && ( this!=(gcone * const)0xfbfbfbfbfbfbfbfb && this!=(gcone * const)0xfbfbfbfb ) )
+        if( this!=NULL)// && ( this!=(gcone * const)0xfbfbfbfbfbfbfbfb && this!=(gcone * const)0xfbfbfbfb ) )
                 return this->UCN;
         else
@@ -1372 +1376 @@
 {
         //NOTE: Can't this be done without new?
-        intvec *res = new intvec(iv->length());
+        intvec *res;// = new intvec(iv->length());
         res=ivCopy(iv);
         *res *= (int)-1;