Changeset e58dbb in git

Timestamp:

Mar 25, 2011, 1:49:49 PM (12 years ago)

Author:

Martin Monerjan

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

787f10764ca8eabeccca61ebad635bf6a2b12c5a

Parents:

de4e64a426712523b3ba44188f1f75f4bb4aad7d

Message:

cleanup


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

Location:

kernel

Files:

• gfan.cc (modified) (22 diffs)
• gfan.h (modified) (2 diffs)

kernel/gfan.cc

@@ -291 +291 @@
         const int64vec* fNormal; //No new since iv64Copy and therefore getFacetNormal return a new
         const int64vec* sNormal;
-        fNormal = f->getRef2FacetNormal();//->getFacetNormal();
-        sNormal = s->getRef2FacetNormal();//->getFacetNormal();
+        fNormal = f->getRef2FacetNormal();
+        sNormal = s->getRef2FacetNormal();
 #include "intvec.h"
         //Do not need parallelity. Too time consuming
@@ -301 +301 @@
         int64vec *fNRef=const_cast<int64vec*>(fNormal);
         int64vec *sNRef=const_cast<int64vec*>(sNormal);
-//      if(isParallel(*fNormal,*sNormal))       
         if(isParallel(*fNRef,*sNRef))
 //      if(fNormal->compare((sNormal))!=0)//Behold! Teh definitive Mandelbug
@@ -312 +311 @@
                 {
                         const int64vec* f2Normal;
-                        f2Normal = f2Act->getRef2FacetNormal();//->getFacetNormal();
+                        f2Normal = f2Act->getRef2FacetNormal();
 //                      int64vec *f2Ref=const_cast<int64vec*>(f2Normal);
                         s2Act = s->codim2Ptr;
@@ -318 +317 @@
                         {
                                 const int64vec* s2Normal;
-                                s2Normal = s2Act->getRef2FacetNormal();//->getFacetNormal();
+                                s2Normal = s2Act->getRef2FacetNormal();
 //                              bool foo=areEqual(f2Normal,s2Normal);
 //                              int64vec *s2Ref=const_cast<int64vec*>(s2Normal);
@@ -325 +324 @@
                                         ctr++;
                                 s2Act = s2Act->next;
-//                              delete s2Normal;
                         }
-//                      delete f2Normal;
                         f2Act = f2Act->next;
                 }               
         }
-//      delete fNormal;
-//      delete sNormal;
         if(ctr==f->numCodim2Facets)
                 res=TRUE;
@@ -347 +342 @@
 #endif
         return res;
-//      int64vec *foo=ivNeg(sNormal);
-//      if(fNormal->compare(foo)!=0) //facet normals
-//      {
-//              delete foo;
-//              res=FALSE;
-//      }
-//      else
-//      {
-//              facet* f2Act;
-//              facet* s2Act;
-//              f2Act = f->codim2Ptr;           
-//              ctr=0;
-//              while(f2Act!=NULL)
-//              {
-//                      int64vec* f2Normal;
-//                      f2Normal = f2Act->getFacetNormal();
-//                      s2Act = s->codim2Ptr;
-//                      while(s2Act!=NULL)
-//                      {
-//                              int64vec* s2Normal;
-//                              s2Normal = s2Act->getFacetNormal();
-// //                           bool foo=areEqual(f2Normal,s2Normal);
-//                              int foo=f2Normal->compare(s2Normal);
-//                              if(foo==0)
-//                                      ctr++;
-//                              s2Act = s2Act->next;
-//                              delete s2Normal;
-//                      }
-//                      delete f2Normal;
-//                      f2Act = f2Act->next;
-//              }
-//      }               
-//      delete fNormal;
-//      delete sNormal;
-//      if(ctr==f->numCodim2Facets)
-//              res=TRUE;
-//      return res;
 }       
                 
@@ -404 +362 @@
 {                               
         return iv64Copy(this->fNormal);
-//      return this->fNormal;
 }
 
@@ -488 +445 @@
 */
 volatile void facet::fDebugPrint()
-{                       
+{
+  #ifndef NDEBUG
         facet *codim2Act;                       
         codim2Act = this->codim2Ptr;
@@ -506 +464 @@
         }
         printf("=======================\n");
-        delete fNormal; 
-}               
-                
-//friend class gcone;   //Bad style
+        delete fNormal;
+  #endif
+}
 
 
@@ -572 +529 @@
 //      this->prev=(gcone *)&gc; //comment in to get a tree
         this->prev=NULL;
-        this->numVars=gc.numVars;                                               
+        this->numVars=gc.numVars;
         this->counter++;
         this->UCN=this->counter;
@@ -662 +619 @@
 volatile void gcone::showFacets(const short codim)
 {
+  #ifndef NDEBUG
         facet *f=this->facetPtr;
         facet *f2=NULL;
@@ -689 +647 @@
         }
         printf("\n");
+  #endif
 }
                 
@@ -694 +653 @@
 static volatile void showSLA(facet &f)
 {
+  #ifndef NDEBUG
         facet *fAct;
         fAct = &f;
@@ -726 +686 @@
                 }
         }
+  #endif
 }
                 
 static void idDebugPrint(const ideal &I)
 {
+  #ifndef NDEBUG
         int numElts=IDELEMS(I);
         printf("Ideal with %i generators\n", numElts);
@@ -739 +701 @@
         }
         printf("\n");
+  #endif
 }
 
@@ -1161 +1124 @@
         //In cases like I=<x-1,y-1> there are only non-flippable facets...
         if(numNonFlip==this->numFacets)
-        {                                       
+        {
                 WerrorS ("Only non-flippable facets. Terminating...\n");
 //              exit(-1);//Bit harsh maybe...
@@ -1382 +1345 @@
         dd_MatrixPtr ddineq;
         dd_ErrorType err;       
-//      if(dd_LinealitySpace->rowsize>0)//The linspace might be 0
-//              ddineq = dd_AppendMatrix(gc.ddFacets,gcone::dd_LinealitySpace);
-//      else
-//              ddineq = dd_CopyMatrix(gc.ddFacets);
         ddineq = (dd_LinealitySpace->rowsize>0) ? dd_AppendMatrix(gc.ddFacets,gcone::dd_LinealitySpace) : dd_CopyMatrix(gc.ddFacets);
         /* In case the input is non-homogeneous we add constrains for the positive orthant.
@@ -1407 +1366 @@
         ddPolyh = dd_DDMatrix2Poly(ddineq, &err);
         dd_MatrixPtr P;
-        P=dd_CopyGenerators(ddPolyh);
+        P=dd_CopyGenerators(ddPolyh);//Here we actually compute the rays!
         dd_FreePolyhedra(ddPolyh);
         dd_FreeMatrix(ddineq);
@@ -1419 +1378 @@
         for(int ii=0;ii<P->rowsize;ii++)
         {
-//              int64vec *foo = new int64vec(this->numVars);
                 int64vec *tmp = ivIntPointOfCone;
                 makeInt(P,ii+1,*foo);
                 ivIntPointOfCone = iv64Add(ivIntPointOfCone,foo);
                 delete tmp;
-//              delete foo;
         }
         delete foo;
@@ -1430 +1387 @@
         for (int ii=0;ii<(this->numVars);ii++)
         {
-//              mpq_t product;
-//              mpq_init(product);
-//              mpq_mul(product,qkgV,colSum[ii]);
-//              (*ivIntPointOfCone)[ii]=(int64)mpz_get_d(mpq_numref(product));
                 if( (*ivIntPointOfCone)[ii]>INT_MAX ) 
                         WarnS("Interior point exceeds INT_MAX!\n");
-//              mpq_clear(product);
                 //Compute intgcd
                 ggT=int64gcd(ggT,(*ivIntPointOfCone)[ii]);
@@ -1450 +1402 @@
                 }
         }
-//      mpq_clear(qkgV);
-//      delete [] colSum;
+
         /*For homogeneous input (like Det3,3,5) the int points may be negative. So add a suitable multiple of (1,_,1)*/
         if(hasHomInput==TRUE && iv64isStrictlyPositive(ivIntPointOfCone)==FALSE)
@@ -2449 +2400 @@
 static bool isParallel(const int64vec &a,const int64vec &b)
 {       
-/*#ifdef gfanp  
-        timeval start, end;
-        gettimeofday(&start, 0);
-#endif*/                
         bool res;
         int lhs=dotProduct(a,b)*dotProduct(a,b);
         int rhs=dotProduct(a,a)*dotProduct(b,b);
-// #ifdef gfanp
-//      gettimeofday(&end, 0);
-//      t_isParallel += (end.tv_sec - start.tv_sec + 1e-6*(end.tv_usec - start.tv_usec));
-// #endif       
-//      return res;
         return res = (lhs==rhs)?TRUE:FALSE;
-}//bool isParallel
+}
 
 /** \brief Compute an interior point of a given cone

kernel/gfan.h

@@ -13 +13 @@
 
 #include <kernel/int64vec.h>
-// #include "int64vec.h"
 
 #define p800
@@ -29 +28 @@
 #endif
 #ifndef USE_ZFAN
-lists grfan(ideal inputIdeal, int heuristic, bool singleCone);
+  lists grfan(ideal inputIdeal, int heuristic, bool singleCone);
 #else
-#include <../gfanlib/gfanlib.h>
-gfan::ZFan *grfan(ideal inputIdeal, int h, bool singleCone);
+  #include <../gfanlib/gfanlib.h>
+  gfan::ZFan *grfan(ideal inputIdeal, int h, bool singleCone);
 #endif
 // lists grcone_by_intvec(ideal inputIdeal);