Changeset ca02ab in git

Timestamp:

Jun 19, 2009, 1:22:06 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

4c4979113300821a84ed183fecde7b3efce05832

Parents:

0724284e35457907e97c6df4677bb5a0677b2501

Message:

Enabled writeConeToFile to write files depending on UCN


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

File:

• kernel/gfan.cc (modified) (5 diffs)

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-06-16 15:49:43 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.62 2009-06-16 15:49:43 monerjan Exp $
-$Id: gfan.cc,v 1.62 2009-06-16 15:49:43 monerjan Exp $
+$Date: 2009-06-19 11:22:06 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.63 2009-06-19 11:22:06 monerjan Exp $
+$Id: gfan.cc,v 1.63 2009-06-19 11:22:06 monerjan Exp $
 */
 
@@ -25 +25 @@
 #include <fstream>      //read-write cones to files
 #include <gmp.h>
+#include <string>
+#include <sstream>
 //#include <gmpxx.h>
 
@@ -1623 +1625 @@
                         We always choose the first facet from fListPtr as facet to be flipped
                         */
-                        while(SearchListAct->next!=NULL)
+                        while(SearchListAct->next!=NULL)
                         {//NOTE See to it that the cone is only changed after ALL facets have been flipped!
                                 //As of now this is not the case!
                                 int flag=1;
-//                              while(fAct->next!=NULL)
-//                              {
-//                                      gcAct->flip(gcAct->gcBasis,SearchListAct);
-//                                      ring rTmp=rCopy(SearchListAct->flipRing);
-//                                      //NOTE It is absolutely crucial to go to the new ring before constructing a new cone!
-//                                      rComplete(rTmp);
-//                                      rChangeCurrRing(rTmp);
-//                                      gcone *gcTmp = new gcone::gcone(*gcAct,*SearchListAct);
-//                                      gcTmp->getConeNormals(gcTmp->gcBasis, FALSE);
-//                                      gcTmp->getCodim2Normals(*gcTmp);
-//                                      /*add facets to SLA here*/                                      
-//                                      rChangeCurrRing(gcAct->baseRing);
-//                                      gcPtr->next=gcTmp;
-//                                      if(flag==1)
-//                                              gcAct->next=gcTmp;
-//                                      gcPtr=gcPtr->next;
-//                                      fAct=fAct->next;
-//                                      flag++;
-//                              }
-//                              
-//                              if(SearchListAct->getUCN()!=SearchListAct->next->getUCN())
-//                              {
-//                                      ring r=rCopy(SearchListAct->flipRing);
-//                                      rComplete(r);
-//                                      rChangeCurrRing(r);
-//                                      gcAct = gcAct->next;
-//                              }
-//                              SearchListAct = SearchListAct->next;
                                 fAct = SearchListAct;
-                                while( (fAct->next!=NULL) && (fAct->getUCN()==fAct->next->getUCN() ) )
+                                //while( ( (fAct->next!=NULL) && (fAct->getUCN()==fAct->next->getUCN() ) ) )
+                                do
                                 {
                                         gcAct->flip(gcAct->gcBasis,fAct);
@@ -1671 +1646 @@
                                                 gcAct->next=gcTmp;
                                         gcPtr=gcPtr->next;
-                                        fAct=fAct->next;
+                                        if(fAct->getUCN() == fAct->next->getUCN())
+                                        {
+                                                fAct=fAct->next;
+                                        }
+                                        else
+                                                break;
                                         flag++;
+                                }while( ( (fAct->next!=NULL) && (fAct->getUCN()==fAct->next->getUCN() ) ) );    
+                                if (fAct->next!=NULL)
+                                {
+                                        SearchListAct=fAct->next;
+                                        ring r=rCopy(SearchListAct->flipRing);
+                                        rComplete(r);
+                                        rChangeCurrRing(r);
+                                        gcAct = gcAct->next;
                                 }
-                                SearchListAct=fAct->next;
-                                ring r=rCopy(SearchListAct->flipRing);
-                                rComplete(r);
-                                rChangeCurrRing(r);
-                                gcAct = gcAct->next;
+                                else
+                                {
+                                        SearchListAct=NULL;
+                                }
                                 
                         }                       
@@ -1852 +1839 @@
                 void writeConeToFile(gcone const &gc, bool usingIntPoints=FALSE)
                 {
-                        ofstream gcOutputFile("/tmp/cone1.gc");
-                        facet *fAct = new facet();
-                        fAct = gc.facetPtr;
+                        int UCN=gc.UCN;
+                        stringstream ss;
+                        ss << UCN;
+                        string UCNstr = ss.str();               
+                        
+                        char prefix[]="/tmp/cone";
+                        char *UCNstring;
+                        strcpy(UCNstring,UCNstr.c_str());
+                        char suffix[]=".sg";
+                        char *filename=strcat(prefix,UCNstring);
+                        strcat(filename,suffix);
+                                        
+                        ofstream gcOutputFile(filename);
+                        facet *fAct = new facet(); //NOTE Why new?
+                        fAct = gc.facetPtr;                     
                         
                         char *ringString = rString(currRing);