Changeset b3bb13 in git

Timestamp:

Mar 15, 2010, 12:51:39 PM (13 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

151609adec09397e40bc7601305d1dd6b3476999

Parents:

17f35f6769d568dadf1181f63670d7717e20726c

Message:

gcone::ivZeroVector
intgcd now static


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

Location:

kernel

Files:

• gfan.cc (modified) (5 diffs)
• gfan.h (modified) (4 diffs)

kernel/gfan.cc

@@ -1593 +1593 @@
                         }
                 }//For non-homog input ivIntPointOfFacet should already be >0 here
-                if(!hasHomInput) {assert(iv64isStrictlyPositive(ivIntPointOfFacet));}
+//              if(!hasHomInput) {assert(iv64isStrictlyPositive(ivIntPointOfFacet));}
                 //if we have no strictly pos ray but the input is homogeneous
                 //then add a suitable multiple of (1,...,1)
@@ -3845 +3845 @@
 /** \brief Compute the gcd of two ints
  */
-inline int gcone::intgcd(const int &a, const int &b)
+static int intgcd(const int &a, const int &b)
 {
         int r, p=a, q=b;
@@ -4386 +4386 @@
 int gcone::numVars;
 bool gcone::hasHomInput=FALSE;
+intvec *gcone::ivZeroVector;
 // ideal gfan(ideal inputIdeal, int h)
 lists gfan(ideal inputIdeal, int h)
@@ -4425 +4426 @@
                                 gcone::hilbertFunction=hHstdSeries(inputIdeal,NULL,NULL,NULL,currRing);
                         }
+                        else
+                        {
+                                gcone::ivZeroVector = new intvec(pVariables);
+                                for(int ii=0;ii<pVariables;ii++)
+                                        (*gcone::ivZeroVector)[ii]=0;
+                        }
         #ifndef NDEBUG
         //              cout << "GB of input ideal is:" << endl;
@@ -4436 +4443 @@
 //                              gcAct->getConeNormals(gcAct->gcBasis);
 //                              lResList=lprepareResult(gcAct,1);
-                                dd_free_global_constants;
+                                dd_free_global_constants();
                                 //This is filthy
                                 return lResList;

kernel/gfan.h

@@ -77 +77 @@
                 unsigned numRays;       //Number of spanning rays of the facet
                 ring flipRing;          //the ring on the other side of the facet
+                intvec **fRays;
                                         
                 /** The default constructor. */
@@ -177 +178 @@
                 /** The hilbert function - for the homogeneous case*/
                 static intvec *hilbertFunction;
+                /** The zero vector. Needed in case of fNormal mismatch*/
+                static intvec *ivZeroVector;
                 
                 /** # of facets of the cone
@@ -226 +229 @@
                 inline bool areEqual( facet *f,  facet *g);
                 inline bool areEqual2(facet* f, facet *g);
-                inline int intgcd(const int &a, const int &b);
+//              inline int intgcd(const int &a, const int &b);
                 inline void writeConeToFile(const gcone &gc, bool usingIntPoints=FALSE);
                 inline void readConeFromFile(int gcNum, gcone *gc);
@@ -263 +266 @@
 };
 lists lprepareResult(gcone *gc, const int n);
+static int intgcd(const int &a, const int &b);
 // bool iv64isStrictlyPositive(intvec *);
 #endif