Changeset 706b89 in git

Timestamp:

Mar 16, 2010, 9:26:07 AM (13 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

11a7dcbdadc31dae36c0918d33c19539f050e5ab

Parents:

ce41a2e25be4abf8c322bc11839ec929ea281509

Message:

The cones are written to disk by default. Rereading must still be
enabled
Prepared for deletion and reconstruction of facet normals
gcone::normalize removed


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

Location:

kernel

Files:

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

kernel/gfan.cc

@@ -3188 +3188 @@
                         idDelete((ideal *)&fAct->flipGB);
                         rDelete(fAct->flipRing);
-                        
-                        gcTmp->getConeNormals(gcTmp->gcBasis, FALSE);   //TODO FALSE is default, so should not be needed here
+
+                        gcTmp->getConeNormals(gcTmp->gcBasis/*, FALSE*/);       //TODO FALSE is default, so should not be needed here
 //                      gcTmp->getCodim2Normals(*gcTmp);
                         gcTmp->getExtremalRays(*gcTmp);
-//                      gcTmp->normalize();// will be done in g2c 
-                        //gcTmp->ddFacets should not be needed anymore, so
+
+
 //                      //NOTE If flip2 is used we need to get an interior point of gcTmp
 //                      // and replace gcTmp->baseRing with an appropriate ring with only
@@ -3199 +3199 @@
 //                      gcTmp->interiorPoint2();
                         gcTmp->replaceDouble_ringorder_a_ByASingleOne();
+                        //gcTmp->ddFacets should not be needed anymore, so
                         dd_FreeMatrix(gcTmp->ddFacets);
 #ifdef gfan_DEBUG
@@ -3209 +3210 @@
                         SearchListRoot=gcTmp->enqueueNewFacets(SearchListRoot);
 #endif
+                        gcTmp->writeConeToFile(*gcTmp);
                         if(gfanHeuristic==1)
                         {
-                                gcTmp->writeConeToFile(*gcTmp);
+//                              gcTmp->writeConeToFile(*gcTmp);
                                 idDelete((ideal*)&gcTmp->gcBasis);//Whonder why?
                                 rDelete(gcTmp->baseRing);
@@ -3279 +3281 @@
                                 }                               
                         }
+//                      else if(gcNext->getUCN() < SearchListRoot->getUCN() )
+//                      {
+//                              idDelete( (ideal*)&gcNext->gcBasis );
+//                              rDelete(gcNext->baseRing);
+//                      }
                         /*else
                         {
@@ -3292 +3299 @@
                 }
                 UCNcounter++;
-                //SearchListAct = SearchListAct->next;
-                //SearchListAct = fAct->next;
                 SearchListAct = SearchListRoot;
         }
@@ -3377 +3382 @@
  * Actually we now also normalize the facet normals.
  */
-void gcone::normalize()
-{
+// void gcone::normalize()
+// {
 //      int *ggT = new int;
 //              *ggT=1;
-        facet *fAct;
-        facet *codim2Act;
-        fAct = this->facetPtr;
-        codim2Act = fAct->codim2Ptr;
-        while(fAct!=NULL)
-        {
-                intvec *fNormal;
-                fNormal = fAct->getFacetNormal();
-                int *ggT = new int;
-                *ggT=1;
-                for(int ii=0;ii<this->numVars;ii++)
-                {
-                        *ggT=intgcd((*ggT),(*fNormal)[ii]);
-                }
-                if(*ggT>1)//We only need to do this if the ggT is non-trivial
-                {
-//                      intvec *fCopy = fAct->getFacetNormal();
-                        for(int ii=0;ii<this->numVars;ii++)
-                                (*fNormal)[ii] = ((*fNormal)[ii])/(*ggT);
-                        fAct->setFacetNormal(fNormal);
-                }               
-                delete fNormal;
-                delete ggT;
-                /*And now for the codim2*/
-                while(codim2Act!=NULL)
-                {                               
-                        intvec *n;
-                        n=codim2Act->getFacetNormal();
-                        int *ggT=new int;
-                        *ggT=1;
-                        for(int ii=0;ii<this->numVars;ii++)
-                        {
-                                *ggT = intgcd((*ggT),(*n)[ii]);
-                        }
-                        if(*ggT>1)
-                        {
-                                for(int ii=0;ii<this->numVars;ii++)
-                                {
-                                        (*n)[ii] = ((*n)[ii])/(*ggT);
-                                }
-                                codim2Act->setFacetNormal(n);
-                        }
-                        codim2Act = codim2Act->next;
-                        delete n;
-                        delete ggT;
-                }
-                fAct = fAct->next;
-        }
-}
+//      facet *fAct;
+//      facet *codim2Act;
+//      fAct = this->facetPtr;
+//      codim2Act = fAct->codim2Ptr;
+//      while(fAct!=NULL)
+//      {
+//              intvec *fNormal;
+//              fNormal = fAct->getFacetNormal();
+//              int *ggT = new int;
+//              *ggT=1;
+//              for(int ii=0;ii<this->numVars;ii++)
+//              {
+//                      *ggT=intgcd((*ggT),(*fNormal)[ii]);
+//              }
+//              if(*ggT>1)//We only need to do this if the ggT is non-trivial
+//              {
+// //                   intvec *fCopy = fAct->getFacetNormal();
+//                      for(int ii=0;ii<this->numVars;ii++)
+//                              (*fNormal)[ii] = ((*fNormal)[ii])/(*ggT);
+//                      fAct->setFacetNormal(fNormal);
+//              }               
+//              delete fNormal;
+//              delete ggT;
+//              /*And now for the codim2*/
+//              while(codim2Act!=NULL)
+//              {                               
+//                      intvec *n;
+//                      n=codim2Act->getFacetNormal();
+//                      int *ggT=new int;
+//                      *ggT=1;
+//                      for(int ii=0;ii<this->numVars;ii++)
+//                      {
+//                              *ggT = intgcd((*ggT),(*n)[ii]);
+//                      }
+//                      if(*ggT>1)
+//                      {
+//                              for(int ii=0;ii<this->numVars;ii++)
+//                              {
+//                                      (*n)[ii] = ((*n)[ii])/(*ggT);
+//                              }
+//                              codim2Act->setFacetNormal(n);
+//                      }
+//                      codim2Act = codim2Act->next;
+//                      delete n;
+//                      delete ggT;
+//              }
+//              fAct = fAct->next;
+//      }
+// }
 
 /** \brief Enqueue new facets into the searchlist 
@@ -4159 +4164 @@
 //                              pDelete(&strPoly);      //NOTE Crashes - already deleted by pAdd                                
                         }
-                        break;
-                }//if(line=="GCBASIS")          
+//                      break;
+                }//if(line=="GCBASIS")  
+                if(line=="FACETS")
+                {
+                        facet *fAct=gc->facetPtr;
+                        for(int ll=0;ll<this->numFacets;ll++)
+                        {
+                                getline(gcInputFile,line);
+                                found = line.find("\t");
+                                string normalString=line.substr(0,found);
+                                intvec *fN = new intvec(this->numVars);
+                                for(int ii=0;ii<this->numVars;ii++)
+                                {
+                                        string component;
+                                        found = normalString.find(",");
+                                        component=normalString.substr(0,found);
+                                        (*fN)[ii]=atol(component.c_str());
+                                        normalString.erase(0,found+1);
+                                }
+                                /*Only the following line needs to be commented out if you decide not to delete fNormals*/
+//                              fAct->setFacetNormal(fN);
+                                delete(fN);
+                                fAct = fAct->next;      //Booh, this is ugly
+                        }                       
+                        break; //NOTE Must always be in the last if-block!
+                }
         }//while(!gcInputFile.eof())    
         gcInputFile.close();

kernel/gfan.h

@@ -238 +238 @@
 //              void noRevS(gcone &gcRoot, bool usingIntPoint=FALSE);
                 void makeInt(const dd_MatrixPtr &M, const int line, intvec &n);
-                void normalize();
+//              void normalize();
                 facet * enqueueNewFacets(facet *f);
                 facet * enqueue2(facet *f);