Changeset 110e721 in git

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

Location:

kernel

Files:

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

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;                                                

kernel/gfan.h

@@ -166 +166 @@
                 void showFacets(short codim=1);
                 volatile void showSLA(facet &f);
-                void idDebugPrint(ideal const &I);
-                void invPrint(ideal const &I);
-                bool isMonomial(ideal const &I);
+                void idDebugPrint(const ideal &I);
+                void invPrint(const ideal &I);
+                bool isMonomial(const ideal &I);
                 intvec *ivNeg(const intvec *iv);
                 int dotProduct(const intvec &iva, const intvec &ivb);
-                bool isParallel(intvec const &a, intvec const &b);
-                bool areEqual(intvec const &a, intvec const &b);
+                bool isParallel(const intvec &a, const intvec &b);
+                bool areEqual(const intvec &a, const intvec &b);
                 bool areEqual(facet *f, facet *g);
                 int intgcd(int a, int b);
-                void writeConeToFile(gcone const &gc, bool usingIntPoints=FALSE);
+                void writeConeToFile(const gcone &gc, bool usingIntPoints=FALSE);
                 void readConeFromFile(int gcNum, gcone *gc);
                 intvec f2M(gcone *gc, facet *f, int n=1);
                 
                 //The real stuff
-                void getConeNormals(ideal const &I, bool compIntPoint=FALSE);
-                void getCodim2Normals(gcone const &gc);
+                void getConeNormals(const ideal &I, bool compIntPoint=FALSE);
+                void getCodim2Normals(const gcone &gc);
                 void flip(ideal gb, facet *f);
                 void computeInv(ideal &gb, ideal &inv, intvec &f);
 //              poly restOfDiv(poly const &f, ideal const &I); removed with r12286
-                ideal ffG(ideal const &H, ideal const &G);
+                ideal ffG(const ideal &H, const ideal &G);
                 void getGB(ideal const &inputIdeal);            
-                void interiorPoint(dd_MatrixPtr const &M, intvec &iv);
-                ring rCopyAndAddWeight(ring const &r, intvec const *ivw);
-                ring rCopyAndChangeWeight(ring const &r, intvec *ivw);          
+                void interiorPoint(const dd_MatrixPtr &M, intvec &iv);
+                ring rCopyAndAddWeight(const ring &r, const intvec *ivw);
+                ring rCopyAndChangeWeight(const ring &r, intvec *ivw);          
 //              void reverseSearch(gcone *gcAct); //NOTE both removed from r12286
 //              bool isSearchFacet(gcone &gcTmp, facet *testfacet);
                 void noRevS(gcone &gcRoot, bool usingIntPoint=FALSE);
-                void makeInt(dd_MatrixPtr const &M, int const line, intvec &n);
+                void makeInt(const dd_MatrixPtr &M, const int line, intvec &n);
                 void normalize();
                 facet * enqueueNewFacets(facet *f);
-                dd_MatrixPtr facets2Matrix(gcone const &gc);            
+                dd_MatrixPtr facets2Matrix(const gcone &gc);            
 //              static void gcone::idPrint(ideal &I);           
                 friend class facet;