Changeset 11a7dc in git

Timestamp:

Mar 16, 2010, 6:38:44 PM (13 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

f524fdf7562a563db23199898e1aa3b16a4619bc

Parents:

706b890c390993bb14ed93acf3c4b09775b93361

Message:

sed s/cout/printf/g
Removed facets2Matrix and interiorPoint2


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

Location:

kernel

Files:

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

kernel/gfan.cc

@@ -25 +25 @@
 #include "prCopy.h"     //Needed for idrCopyR
 #include "stairc.h"     //For Hilbert series
-#include <iostream>
 // #include <bitset>
 #include <fstream>      //read-write cones to files
@@ -77 +76 @@
 //NOTE Defining this will slow things down!
 //Only good for very coarse profiling
-// #define gfanp
+#define gfanp
 #ifdef gfanp
 #include <sys/time.h>
+#include <iostream>
 #endif
 
@@ -201 +201 @@
 {
 #ifdef gfan_DEBUG
-        cout << "shallowdel@UCN " << this->getUCN() << endl;
+        printf("shallowdel@UCN %i\n", this->getUCN());
 #endif
         this->fNormal=NULL;
@@ -219 +219 @@
 {
 #ifdef gfan_DEBUG
-        cout << "~facet@UCN " << this->getUCN() << endl;
+        printf("~facet@UCN %i\n",this->getUCN());
 #endif
         if(this->fNormal!=NULL)
@@ -279 +279 @@
 #ifdef gfanp
         gettimeofday(&end, 0);
-        t_areEqual += (end.tv_sec - start.tv_sec + 1e-6*(end.tv_usec - start.tv_usec));
+        gcone::t_areEqual += (end.tv_sec - start.tv_sec + 1e-6*(end.tv_usec - start.tv_usec));
 #endif  
         return res;
@@ -357 +357 @@
 #ifdef gfanp
         gettimeofday(&end, 0);
-        t_areEqual += (end.tv_sec - start.tv_sec + 1e-6*(end.tv_usec - start.tv_usec));
+        gcone::t_areEqual += (end.tv_sec - start.tv_sec + 1e-6*(end.tv_usec - start.tv_usec));
 #endif
         return res;
@@ -506 +506 @@
         intvec *fNormal;
         fNormal = this->getFacetNormal();       
-        cout << "=======================" << endl;
-        cout << "Facet normal = (";
-        fNormal->show(1,1);
-        cout << ")"<<endl;      
-        cout << "-----------------------" << endl;
-        cout << "Codim2 facets:" << endl;
+        printf("=======================\n");
+        printf("Facet normal = (");fNormal->show(1,1);printf(")\n");
+        printf("-----------------------\n");
+        printf("Codim2 facets:\n");
         while(codim2Act!=NULL)
         {
                 intvec *f2Normal;
                 f2Normal = codim2Act->getFacetNormal();
-                cout << "(";
-                f2Normal->show(1,0);
-                cout << ")" << endl;
+                printf("(");f2Normal->show(1,0);printf(")\n");
                 codim2Act = codim2Act->next;
                 delete f2Normal;
         }
-        cout << "=======================" << endl;
+        printf("=======================\n");
         delete fNormal; 
 }               
@@ -687 +683 @@
                 intvec *iv;
                 iv = f->getFacetNormal();
-                cout << "(";
-                iv->show(1,0);                          
+                printf("(");iv->show(1,0);
                 if(f->isFlippable==FALSE)
-                        cout << ")* ";
+                        printf(")* ");
                 else
-                        cout << ") ";
+                        printf(") ");
                 delete iv;
                 if(codim==2)
@@ -699 +694 @@
                         while(f2!=NULL)
                         {
-                                cout << "[";
-                                f2->getFacetNormal()->show(1,0);
-                                cout << "]";
+                                printf("[");f2->getFacetNormal()->show(1,0);printf("]");
                                 f2 = f2->next;
                         }
-                        cout << endl;
+                        printf("\n");
                 }
                 f=f->next;
         }
-        cout << endl;
+        printf("\n");
 }
                 
@@ -721 +714 @@
                 codim2Act = fAct->codim2Ptr;
                 
-                cout << endl;
+                printf("\n");
                 while(fAct!=NULL)
                 {
                         intvec *fNormal;                
                         fNormal=fAct->getFacetNormal();
-                        cout << "(";
-                        fNormal->show(1,0);
+                        printf("(");fNormal->show(1,0);
                         if(fAct->isFlippable==TRUE)
-                                cout << ") ";
+                                printf(") ");
                         else
-                                cout << ")* ";
+                                printf(")* ");
                         delete fNormal;
                         codim2Act = fAct->codim2Ptr;
-                        cout << " Codim2: ";
+                        printf(" Codim2: ");
                         while(codim2Act!=NULL)
                         {
                                 intvec *f2Normal;
                                 f2Normal = codim2Act->getFacetNormal();
-                                cout << "(";
-                                f2Normal->show(1,0);
-                                cout << ") ";
+                                printf("(");f2Normal->show(1,0);printf(") ");
                                 delete f2Normal;
                                 codim2Act = codim2Act->next;
                         }
-                        cout << "UCN = " << fAct->getUCN() << endl;                             
+                        printf("UCN = %i",fAct->getUCN());
                         fAct = fAct->next;
                 }
@@ -754 +744 @@
 {
         int numElts=IDELEMS(I);
-        cout << "Ideal with " << numElts << " generators" << endl;
-        cout << "Leading terms: ";
+        printf("Ideal with %i generators\n", numElts);
+        printf("Leading terms: ");
         for (int ii=0;ii<numElts;ii++)
         {
                 pWrite0(pHead(I->m[ii]));
-                cout << ",";
-        }
-        cout << endl;
+                printf(",");
+        }
+        printf("\n");
 }
 
@@ -1124 +1114 @@
                                 fAct->setUCN(this->getUCN());
 #ifdef gfan_DEBUG
-                                cout << "Marking facet (";
-                                load->show(1,0);
-                                cout << ") as non flippable" << endl;                           
+                                printf("Marking facet (");load->show(1,0);printf(") as non flippable\n");               
 #endif
                         }
@@ -1721 +1709 @@
 #ifdef gfan_DEBUG
 //      std::cout << "running gcone::flip" << std::endl;
-        std::cout << "flipping UCN " << this->getUCN();
-        cout << " over facet (";
+        printf("flipping UCN %i over facet",this->getUCN());
         fNormal->show(1,0);
-        cout << ") with UCN " << f->getUCN();
-        std::cout << std::endl;
+        printf(") with UCN %i\n",f->getUCN() ); 
 #endif
         if(this->getUCN() != f->getUCN())
@@ -2058 +2044 @@
         f->flipRing=rCopy(dstRing);     //store the ring on the other side
 #ifdef gfan_DEBUG
-        cout << "Flipped GB is UCN " << counter+1 << ":" << endl;
-        this->idDebugPrint(dstRing_I);
-//      idPrint(dstRing_I);
-        cout << endl;
+        printf("Flipped GB is UCN %i:\n",counter+1);
+        idDebugPrint(dstRing_I);
+        printf("\n");
 #endif  
         idDelete(&dstRing_I);   
@@ -2087 +2072 @@
 * Is there a way to construct a vector from \f$ \omega \f$ and the facet normal?
 */
-inline void gcone::flip2(const ideal gb, facet *f)
+inline void gcone::flip2(const ideal &gb, facet *f)
 {
 #ifdef gfanp
@@ -2096 +2081 @@
         fNormal = f->getRef2FacetNormal();/*->getFacetNormal();*/       //read this->fNormal;
 #ifdef gfan_DEBUG
-        std::cout << "flipping UCN " << this->getUCN();
-        cout << " over facet (";
+        printf("flipping UCN %i over facet(",this->getUCN());
         fNormal->show(1,0);
-        cout << ") with UCN " << f->getUCN();
-        std::cout << std::endl;
+        printf(") with UCN %i\n",f->getUCN());  
 #endif
         if(this->getUCN() != f->getUCN())
-        {       cout << this->getUCN() << " vs " << f->getUCN() << endl;
+        {       printf("%i vs %i\n",this->getUCN(), f->getUCN() );
                 WerrorS("Uh oh... Trying to flip over facet with incompatible UCN");
                 exit(-1);
@@ -2550 +2533 @@
 //      if (err!=dd_NoError){WerrorS("Error during dd_CopyLPSolution");}
 #ifdef gfan_DEBUG
-        cout << "Interior point: ";
+        printf("Interior point: ");
         for (int ii=1; ii<(lpSol->d)-1;ii++)
         {
                 dd_WriteNumber(stdout,lpSol->sol[ii]);
         }
-        cout << endl;
+        printf("\n");
 #endif                  
         //NOTE The following strongly resembles parts of makeInt. 
@@ -2614 +2597 @@
 *NOTE no longer used nor maintained. MM Mar 9, 2010
 */
-void gcone::interiorPoint2()
-{//idPrint(this->gcBasis);
-#ifdef gfan_DEBUG
-        if(this->ivIntPt!=NULL)
-                WarnS("Interior point already exists - ovrewriting!");
-#endif
-        facet *f1 = this->facetPtr;
-        facet *f2 = NULL;
-        intvec *intF1=NULL;
-        while(f1!=NULL)
-        {
-                if(f1->isFlippable)
-                {
-                        facet *f1Ray = f1->codim2Ptr;
-                        while(f1Ray!=NULL)
-                        {
-                                const intvec *check=f1Ray->getRef2FacetNormal();
-                                if(iv64isStrictlyPositive(check))
-                                {
-                                        intF1=ivCopy(check);
-                                        break;
-                                }                               
-                                f1Ray=f1Ray->next;
-                        }
-                }
-                if(intF1!=NULL)
-                        break;
-                f1=f1->next;
-        }
-        if(f1!=NULL && f1->next!=NULL)//Choose another facet, different from f1
-                f2=f1->next;
-        else
-                f2=this->facetPtr;
-        if(intF1==NULL && hasHomInput==TRUE)
-        {
-                intF1 = new intvec(this->numVars);
-                for(int ii=0;ii<this->numVars;ii++)
-                        (*intF1)[ii]=1;
-        }
-        assert(f1); assert(f2);
-        intvec *intF2=f2->getInteriorPoint();
-        mpq_t *qPosRay = new mpq_t[this->numVars];//The positive ray from above
-        mpq_t *qIntPt = new mpq_t[this->numVars];//starting vector a+((b-a)/2)
-        mpq_t *qPosIntPt = new mpq_t[this->numVars];//This should be >0 eventually
-        for(int ii=0;ii<this->numVars;ii++)
-        {
-                mpq_init(qPosRay[ii]);
-                mpq_init(qIntPt[ii]);
-                mpq_init(qPosIntPt[ii]);
-        }       
-        //Compute a+((b-a)/2) && Convert intF1 to mpq
-        for(int ii=0;ii<this->numVars;ii++)
-        {
-                mpq_t a,b;
-                mpq_init(a); mpq_init(b);
-                mpq_set_si(a,(*intF1)[ii],1);
-                mpq_set_si(b,(*intF2)[ii],1);
-                mpq_t diff;
-                mpq_init(diff);
-                mpq_sub(diff,b,a);      //diff=b-a
-                mpq_t quot;
-                mpq_init(quot);
-                mpq_div_2exp(quot,diff,1);      //quot=diff/2=(b-a)/2
-                mpq_clear(diff);
-                //Don't be clever and reuse diff here
-                mpq_t sum; mpq_init(sum);
-                mpq_add(sum,b,quot);    //sum=b+quot=a+(b-a)/2
-                mpq_set(qIntPt[ii],sum);
-                mpq_clear(sum);
-                mpq_clear(quot);
-                mpq_clear(a); mpq_clear(b);
-                //Now for intF1
-                mpq_set_si(qPosRay[ii],(*intF1)[ii],1);
-        }
-        //Now add: qPosIntPt=qPosRay+qIntPt until qPosIntPt >0
-        while(TRUE)
-        {       
-                bool success=FALSE;
-                int posCtr=0;   
-                for(int ii=0;ii<this->numVars;ii++)
-                {
-                        mpq_t sum; mpq_init(sum);
-                        mpq_add(sum,qPosRay[ii],qIntPt[ii]);
-                        mpq_set(qPosIntPt[ii],sum);
-                        mpq_clear(sum);
-                        if(mpq_sgn(qPosIntPt[ii])==1)
-                                posCtr++;
-                }
-                if(posCtr==this->numVars)//qPosIntPt > 0 
-                        break;
-                else
-                {
-                        mpq_t qTwo; mpq_init(qTwo);
-                        mpq_set_ui(qTwo,2,1);
-                        for(int jj=0;jj<this->numVars;jj++)
-                        {
-                                mpq_t tmp; mpq_init(tmp);
-                                mpq_mul(tmp,qPosRay[jj],qTwo);
-                                mpq_set( qPosRay[jj], tmp);
-                                mpq_clear(tmp);
-                        }
-                        mpq_clear(qTwo);
-                }
-        }//while
-        //Now qPosIntPt ought to be >0, so convert back to int :D
-        /*Compute lcm of the denominators*/
-        mpz_t *denom = new mpz_t[this->numVars];
-        mpz_t tmp,kgV;
-        mpz_init(tmp); mpz_init(kgV);
-        for (int ii=0;ii<this->numVars;ii++)
-        {
-                mpz_t z;
-                mpz_init(z);
-                mpq_get_den(z,qPosIntPt[ii]);
-                mpz_init(denom[ii]);
-                mpz_set( denom[ii], z);
-                mpz_clear(z);                           
-        }
-                
-        mpz_set(tmp,denom[0]);
-        for (int ii=0;ii<this->numVars;ii++)
-        {
-                mpz_lcm(kgV,tmp,denom[ii]);
-                mpz_set(tmp,kgV);                               
-        }
-        mpz_clear(tmp); 
-        /*Multiply the nominators by kgV*/
-        mpq_t qkgV,res;
-        mpq_init(qkgV);
-        mpq_canonicalize(qkgV);         
-        mpq_init(res);
-        mpq_canonicalize(res);
-                                
-        mpq_set_num(qkgV,kgV);
-        intvec *n=new intvec(this->numVars);
-        for (int ii=0;ii<this->numVars;ii++)
-        {
-                mpq_canonicalize(qPosIntPt[ii]);
-                mpq_mul(res,qkgV,qPosIntPt[ii]);
-                (*n)[ii]=(int)mpz_get_d(mpq_numref(res));
-        }
-        this->setIntPoint(n);
-        delete n;
-        delete [] qPosIntPt;
-        delete [] denom;
-        delete [] qPosRay;
-        delete [] qIntPt;
-        mpz_clear(kgV);
-        mpq_clear(qkgV); mpq_clear(res);
-}
+// void gcone::interiorPoint2()
+// {//idPrint(this->gcBasis);
+// #ifdef gfan_DEBUG
+//      if(this->ivIntPt!=NULL)
+//              WarnS("Interior point already exists - ovrewriting!");
+// #endif
+//      facet *f1 = this->facetPtr;
+//      facet *f2 = NULL;
+//      intvec *intF1=NULL;
+//      while(f1!=NULL)
+//      {
+//              if(f1->isFlippable)
+//              {
+//                      facet *f1Ray = f1->codim2Ptr;
+//                      while(f1Ray!=NULL)
+//                      {
+//                              const intvec *check=f1Ray->getRef2FacetNormal();
+//                              if(iv64isStrictlyPositive(check))
+//                              {
+//                                      intF1=ivCopy(check);
+//                                      break;
+//                              }                               
+//                              f1Ray=f1Ray->next;
+//                      }
+//              }
+//              if(intF1!=NULL)
+//                      break;
+//              f1=f1->next;
+//      }
+//      if(f1!=NULL && f1->next!=NULL)//Choose another facet, different from f1
+//              f2=f1->next;
+//      else
+//              f2=this->facetPtr;
+//      if(intF1==NULL && hasHomInput==TRUE)
+//      {
+//              intF1 = new intvec(this->numVars);
+//              for(int ii=0;ii<this->numVars;ii++)
+//                      (*intF1)[ii]=1;
+//      }
+//      assert(f1); assert(f2);
+//      intvec *intF2=f2->getInteriorPoint();
+//      mpq_t *qPosRay = new mpq_t[this->numVars];//The positive ray from above
+//      mpq_t *qIntPt = new mpq_t[this->numVars];//starting vector a+((b-a)/2)
+//      mpq_t *qPosIntPt = new mpq_t[this->numVars];//This should be >0 eventually
+//      for(int ii=0;ii<this->numVars;ii++)
+//      {
+//              mpq_init(qPosRay[ii]);
+//              mpq_init(qIntPt[ii]);
+//              mpq_init(qPosIntPt[ii]);
+//      }       
+//      //Compute a+((b-a)/2) && Convert intF1 to mpq
+//      for(int ii=0;ii<this->numVars;ii++)
+//      {
+//              mpq_t a,b;
+//              mpq_init(a); mpq_init(b);
+//              mpq_set_si(a,(*intF1)[ii],1);
+//              mpq_set_si(b,(*intF2)[ii],1);
+//              mpq_t diff;
+//              mpq_init(diff);
+//              mpq_sub(diff,b,a);      //diff=b-a
+//              mpq_t quot;
+//              mpq_init(quot);
+//              mpq_div_2exp(quot,diff,1);      //quot=diff/2=(b-a)/2
+//              mpq_clear(diff);
+//              //Don't be clever and reuse diff here
+//              mpq_t sum; mpq_init(sum);
+//              mpq_add(sum,b,quot);    //sum=b+quot=a+(b-a)/2
+//              mpq_set(qIntPt[ii],sum);
+//              mpq_clear(sum);
+//              mpq_clear(quot);
+//              mpq_clear(a); mpq_clear(b);
+//              //Now for intF1
+//              mpq_set_si(qPosRay[ii],(*intF1)[ii],1);
+//      }
+//      //Now add: qPosIntPt=qPosRay+qIntPt until qPosIntPt >0
+//      while(TRUE)
+//      {       
+//              bool success=FALSE;
+//              int posCtr=0;   
+//              for(int ii=0;ii<this->numVars;ii++)
+//              {
+//                      mpq_t sum; mpq_init(sum);
+//                      mpq_add(sum,qPosRay[ii],qIntPt[ii]);
+//                      mpq_set(qPosIntPt[ii],sum);
+//                      mpq_clear(sum);
+//                      if(mpq_sgn(qPosIntPt[ii])==1)
+//                              posCtr++;
+//              }
+//              if(posCtr==this->numVars)//qPosIntPt > 0 
+//                      break;
+//              else
+//              {
+//                      mpq_t qTwo; mpq_init(qTwo);
+//                      mpq_set_ui(qTwo,2,1);
+//                      for(int jj=0;jj<this->numVars;jj++)
+//                      {
+//                              mpq_t tmp; mpq_init(tmp);
+//                              mpq_mul(tmp,qPosRay[jj],qTwo);
+//                              mpq_set( qPosRay[jj], tmp);
+//                              mpq_clear(tmp);
+//                      }
+//                      mpq_clear(qTwo);
+//              }
+//      }//while
+//      //Now qPosIntPt ought to be >0, so convert back to int :D
+//      /*Compute lcm of the denominators*/
+//      mpz_t *denom = new mpz_t[this->numVars];
+//      mpz_t tmp,kgV;
+//      mpz_init(tmp); mpz_init(kgV);
+//      for (int ii=0;ii<this->numVars;ii++)
+//      {
+//              mpz_t z;
+//              mpz_init(z);
+//              mpq_get_den(z,qPosIntPt[ii]);
+//              mpz_init(denom[ii]);
+//              mpz_set( denom[ii], z);
+//              mpz_clear(z);                           
+//      }
+//              
+//      mpz_set(tmp,denom[0]);
+//      for (int ii=0;ii<this->numVars;ii++)
+//      {
+//              mpz_lcm(kgV,tmp,denom[ii]);
+//              mpz_set(tmp,kgV);                               
+//      }
+//      mpz_clear(tmp); 
+//      /*Multiply the nominators by kgV*/
+//      mpq_t qkgV,res;
+//      mpq_init(qkgV);
+//      mpq_canonicalize(qkgV);         
+//      mpq_init(res);
+//      mpq_canonicalize(res);
+//                              
+//      mpq_set_num(qkgV,kgV);
+//      intvec *n=new intvec(this->numVars);
+//      for (int ii=0;ii<this->numVars;ii++)
+//      {
+//              mpq_canonicalize(qPosIntPt[ii]);
+//              mpq_mul(res,qkgV,qPosIntPt[ii]);
+//              (*n)[ii]=(int)mpz_get_d(mpq_numref(res));
+//      }
+//      this->setIntPoint(n);
+//      delete n;
+//      delete [] qPosIntPt;
+//      delete [] denom;
+//      delete [] qPosRay;
+//      delete [] qIntPt;
+//      mpz_clear(kgV);
+//      mpq_clear(qkgV); mpq_clear(res);
+// }
         
 /** \brief Copy a ring and add a weighted ordering in first place
@@ -2846 +2829 @@
                 
 //NOTE not needed anywhere
-ring rCopyAndChangeWeight(ring const &r, intvec *ivw)
-{
-        ring res=rCopy0(currRing);
-        rComplete(res);
-        rSetWeightVec(res,(int64*)ivw);
-        //rChangeCurrRing(rnew);
-        return res;
-}
+// ring rCopyAndChangeWeight(ring const &r, intvec *ivw)
+// {
+//      ring res=rCopy0(currRing);
+//      rComplete(res);
+//      rSetWeightVec(res,(int64*)ivw);
+//      //rChangeCurrRing(rnew);
+//      return res;
+// }
                 
 /** \brief Checks whether a given facet is a search facet
@@ -3030 +3013 @@
         
 #ifdef gfan_DEBUG
-        cout << "NoRevs" << endl;
-        cout << "Facets are:" << endl;
+        printf("NoRevs\n");
+        printf("Facets are:\n");
         gcAct->showFacets();
 #endif                  
@@ -3219 +3202 @@
 #ifdef gfan_DEBUG
                         if(SearchListRoot!=NULL)
-                                gcTmp->showSLA(*SearchListRoot);
+                                showSLA(*SearchListRoot);
 #endif                  
                         rChangeCurrRing(gcAct->baseRing);
@@ -3301 +3284 @@
                 SearchListAct = SearchListRoot;
         }
-        cout << endl << "Found " << counter << " cones - terminating" << endl;
+        printf("\nFound %i cones - terminating\n", counter);
 }//void noRevS(gcone &gc)       
                 
@@ -3533 +3516 @@
                                 slNormal = slAct->getFacetNormal();
 #ifdef gfan_DEBUG
-                                cout << "Checking facet (";fNormal->show(1,1);cout << ") against (";slNormal->show(1,1);cout << ")" << endl;
+                                printf("Checking facet (");fNormal->show(1,1);printf(") against (");slNormal->show(1,1);printf(")\n");
 #endif                          
 //                              if( (areEqual(fAct,slAct) && (!areEqual2(fAct,slAct)) ))
@@ -3564 +3547 @@
                                         }
 #ifdef gfan_DEBUG
-                                        cout << "Removing (";fNormal->show(1,1);cout << ") from list" << endl;
+                                        printf("Removing (");fNormal->show(1,1);printf(") from list\n");
 #endif
                                         delete slNormal;
@@ -3714 +3697 @@
                                 removalOccured=FALSE;
 #ifdef gfan_DEBUG
-cout << "Checking facet (";fAct->fNormal->show(1,1);cout << ") against (";slAct->fNormal->show(1,1);cout << ")" << endl;
+        printf("Checking facet (");fAct->fNormal->show(1,1);printf(") against (");slAct->fNormal->show(1,1);printf(")\n");
 #endif  
                                 if(areEqual2(fAct,slAct))
@@ -3738 +3721 @@
                                         gcone::lengthOfSearchList--;
 #ifdef gfan_DEBUG
-cout << "Removing (";fAct->fNormal->show(1,1);cout << ") from list" << endl;
+printf("Removing (");fAct->fNormal->show(1,1);printf(") from list");
 #endif
                                         fDeleteMarker->shallowDelete();//Sets everything to NULL
@@ -3848 +3831 @@
  * NO LONGER USED
  */
-inline dd_MatrixPtr gcone::facets2Matrix(const gcone &gc)
-{
-        facet *fAct;
-        fAct = gc.facetPtr;
-        
-        dd_MatrixPtr M;
-        dd_rowrange ddrows;
-        dd_colrange ddcols;
-        ddcols=(this->numVars)+1;
-        ddrows=this->numFacets;
-        dd_NumberType numb = dd_Integer;
-        M=dd_CreateMatrix(ddrows,ddcols);                       
-                        
-        int jj=0;
-        
-        while(fAct!=NULL)
-        {
-                intvec *comp;
-                comp = fAct->getFacetNormal();
-                for(int ii=0;ii<this->numVars;ii++)
-                {
-                        dd_set_si(M->matrix[jj][ii+1],(*comp)[ii]);
-                }
-                jj++;
-                delete comp;
-                fAct=fAct->next;                                
-        }                       
-        return M;
-}
+// inline dd_MatrixPtr gcone::facets2Matrix(const gcone &gc)
+// {
+//      facet *fAct;
+//      fAct = gc.facetPtr;
+//      
+//      dd_MatrixPtr M;
+//      dd_rowrange ddrows;
+//      dd_colrange ddcols;
+//      ddcols=(this->numVars)+1;
+//      ddrows=this->numFacets;
+//      dd_NumberType numb = dd_Integer;
+//      M=dd_CreateMatrix(ddrows,ddcols);                       
+//                      
+//      int jj=0;
+//      
+//      while(fAct!=NULL)
+//      {
+//              intvec *comp;
+//              comp = fAct->getFacetNormal();
+//              for(int ii=0;ii<this->numVars;ii++)
+//              {
+//                      dd_set_si(M->matrix[jj][ii+1],(*comp)[ii]);
+//              }
+//              jj++;
+//              delete comp;
+//              fAct=fAct->next;                                
+//      }                       
+//      return M;
+// }
                 
 /** \brief Write information about a cone into a file on disk
@@ -3920 +3903 @@
         if (!gcOutputFile)
         {
-                cout << "Error opening file for writing in writeConeToFile" << endl;
+                WerrorS("Error opening file for writing in writeConeToFile\n");
         }
         else
@@ -4344 +4327 @@
 float gcone::t_markings;
 float gcone::t_dd;
-float gcone::t_kStd;
+float gcone::t_kStd=0;
 float gcone::time_enqueue;
 float gcone::time_computeInv;
@@ -4409 +4392 @@
                         {//FIXME
                                 WerrorS("Monomial input - terminating");
-                                lResList->Init(1);
-//                              exit(-1);
-//                              gcAct->getConeNormals(gcAct->gcBasis);
-//                              lResList=lprepareResult(gcAct,1);
                                 dd_free_global_constants();
                                 //This is filthy
-                                return lResList;
+                                goto pointOfNoReturn;
+                                //return lResList;
                         }                       
                         gcAct->getConeNormals(gcAct->gcBasis);
@@ -4422 +4402 @@
                         gcAct->noRevS(*gcAct);  //Here we go!
                         //Switch back to the ring the computation was started in
-//                      rChangeCurrRing(inputRing);
+                        //rChangeCurrRing(inputRing);
                         //res=gcAct->gcBasis;
-                        //Below is a workaround, since gcAct->gcBasis gets deleted in noRevS
-//                      res = inputIdeal; 
+                        //Below is a workaround, since gcAct->gcBasis gets deleted in noRevS                    
                         lResList=lprepareResult(gcRoot,gcRoot->getCounter());
                         /*Cleanup*/
@@ -4444 +4423 @@
         {
                 //Simply return an empty list
-                WerrorS("Ring has non-global ordering - terminating");
-                lResList->Init(1);
-//              lResList->m[0].rtyp=INT_CMD;
-//              int ires=0;
-//              lResList->m[0].data=(void*)&ires;
-        }
-        //gcone::counter=0;
+                WerrorS("Ring has non-global ordering.\nThis function requires your current ring to be endowed with a global ordering.\n Now terminating!");
+                goto pointOfNoReturn;
+        }
         /*Return result*/
 #ifdef gfanp
@@ -4475 +4450 @@
         cout << " out of which there were " << gcone::parallelButNotEqual << " parallel but not equal." << endl;
 #endif
-        cout << "Maximum lenght of list of facets: " << gcone::maxSize << endl;
-
+        printf("Maximum lenght of list of facets: %i", gcone::maxSize);
+pointOfNoReturn:
         return lResList;
 }

kernel/gfan.h

@@ -65 +65 @@
                 unsigned numRays;       //Number of spanning rays of the facet
                 ring flipRing;          //the ring on the other side of the facet
-                intvec **fRays;
+//              intvec **fRays;
                                 
                 /** The default constructor. */
@@ -223 +223 @@
                 void getExtremalRays(const gcone &gc);
                 void flip(ideal gb, facet *f);
-                void flip2(const ideal gb, facet *f);
+                void flip2(const ideal &gb, facet *f);
                 void computeInv(const ideal &gb, ideal &inv, const intvec &f);
                 //poly restOfDiv(poly const &f, ideal const &I); removed with r12286
                 inline ideal ffG(const ideal &H, const ideal &G);
                 inline void getGB(ideal const &inputIdeal);             
-                void interiorPoint( dd_MatrixPtr &M, intvec &iv);
-                void interiorPoint2(); //removed Feb 8th, 2010, new method Feb 19th, 2010
+                void interiorPoint( dd_MatrixPtr &M, intvec &iv);//used from flip and optionally from getConeNormals
+//              void interiorPoint2(); //removed Feb 8th, 2010, new method Feb 19th, 2010, again removed Mar 16th, 2010
                 void preprocessInequalities(dd_MatrixPtr &M);
                 ring rCopyAndAddWeight(const ring &r, intvec *ivw);
                 ring rCopyAndAddWeight2(const ring &, const intvec *, const intvec *);
-                ring rCopyAndChangeWeight(const ring &r, intvec *ivw);          
+//              ring rCopyAndChangeWeight(const ring &r, intvec *ivw);  //NOTE remove   
 //              void reverseSearch(gcone *gcAct); //NOTE both removed from r12286
-//              bool isSearchFacet(gcone &gcTmp, facet *testfacet);
-//              void noRevS(gcone &gcRoot, bool usingIntPoint=FALSE);
+//              bool isSearchFacet(gcone &gcTmp, facet *testfacet); //NOTE remove
                 void makeInt(const dd_MatrixPtr &M, const int line, intvec &n);
-//              void normalize();
+//              void normalize();//NOTE REMOVE
                 facet * enqueueNewFacets(facet *f);
                 facet * enqueue2(facet *f);
-                dd_MatrixPtr facets2Matrix(const gcone &gc);
+//              dd_MatrixPtr facets2Matrix(const gcone &gc);//NOTE remove
                 /** Compute the lineality space Ax=0 and return it as dd_MatrixPtr dd_LinealitySpace*/
                 dd_MatrixPtr computeLinealitySpace();