Changeset d2cd515 in git for kernel/gfan.cc

Timestamp:

Oct 20, 2009, 12:39:18 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

bb503c7363e3c90a3b0c5ae93374d5b7b20cc34a

Parents:

e9806890fa4b234b8c11d976584cab53f617eb21

Message:

extra.cc: gfan now takes a second parameter for storage heuristic of GBs
gfan.cc: reconstruction of polys from file


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-10-19 15:40:39 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.97 2009-10-19 15:40:39 monerjan Exp $
-$Id: gfan.cc,v 1.97 2009-10-19 15:40:39 monerjan Exp $
+$Date: 2009-10-20 10:39:18 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.98 2009-10-20 10:39:18 monerjan Exp $
+$Id: gfan.cc,v 1.98 2009-10-20 10:39:18 monerjan Exp $
 */
 
@@ -1705 +1705 @@
         
         /* Use pure SLA or writeCone2File */
-        enum heuristic {
-                ram,
-                hdd
-        };
-        heuristic h;
-        h=hdd;
+//      enum heuristic {
+//              ram,
+//              hdd
+//      };
+//      heuristic h;
+//      h=hdd;
         
 #ifdef gfan_DEBUG
@@ -1830 +1830 @@
                         gcTmp->showFacets(1);
 #endif
-                        if(h==hdd)
+                        if(gfanHeuristic==1)
                         {
                                 gcTmp->writeConeToFile(*gcTmp);
@@ -1886 +1886 @@
                         else if( gcNext->getUCN() == SearchListRoot->getUCN() )
                         {//NOTE: Implement heuristic to be used!
-                                if(h==ram)
+                                if(gfanHeuristic==0)
                                 {
                                         gcAct = gcNext;
@@ -1894 +1894 @@
                                         break;
                                 }
-                                else if(h==hdd)
+                                else if(gfanHeuristic==1)
                                 {
                                         //Read st00f from file
@@ -2561 +2561 @@
                                 while(!line.empty())
                                 {
+                                        hasNegCoeff = FALSE;
                                         found = line.find_first_of("+-");       //get the first monomial
                                         string tmp;
@@ -2579 +2580 @@
                                         {
                                                 hasCoeffInQ = TRUE;
-                                                strCoeffNom=strMonom.substr(0,found);
-                                                strCoeffDenom=strMonom.substr(found+1,strMonom.find_first_not_of("1234567890"));//string::npos);
-                                                ss << strCoeffNom;
-                                                ss >> intCoeffNom;
-                                                nCoeffNom=nInit(intCoeffNom);
-                                                ss << strCoeffDenom;
-                                                ss >> intCoeffDenom;
-                                                nCoeffDenom=nInit(intCoeffDenom);
+                                                strCoeffNom=strMonom.substr(0,found);                                           
+                                                strCoeffDenom=strMonom.substr(found+1,strMonom.find_first_not_of("1234567890"));
+                                                strMonom.erase(0,found);
+                                                strMonom.erase(0,strMonom.find_first_not_of("1234567890/"));                    
+//                                              ss << strCoeffNom;
+//                                              ss >> intCoeffNom;
+//                                              nCoeffNom=(snumber*)strCoeffNom.c_str();
+                                                nRead(strCoeffNom.c_str(), &nCoeffNom);
+                                                nRead(strCoeffDenom.c_str(), &nCoeffDenom);
+//                                              nCoeffNom=nInit(intCoeffNom);
+//                                              ss << strCoeffDenom;
+//                                              ss >> intCoeffDenom;
+//                                              nCoeffDenom=nInit(intCoeffDenom);
+//                                              nCoeffDenom=(snumber*)strCoeffNom.c_str();
                                                 //NOTE NOT SURE WHETHER THIS WILL WORK!
                                                 //nCoeffNom=nInit(intCoeffNom);
@@ -2598 +2605 @@
                                                 if(!strCoeff.empty())
                                                 {
-//                                                      ss << strCoeff;
-//                                                      ss >> intCoeff;
-                                                        nCoeff=(snumber*)strCoeff.c_str();
+                                                        nRead(strCoeff.c_str(),&nCoeff);
                                                 }
                                                 else
@@ -2616 +2621 @@
                                                 case TRUE:
                                                         if(hasNegCoeff)
-                                                                nCoeff=nNeg(nCoeffNom);
+                                                                nCoeffNom=nNeg(nCoeffNom);
 //                                                              intCoeffNom *= -1;
 //                                                      pSetCoeff(strPoly, nDiv((number)intCoeffNom, (number)intCoeffDenom));
                                                         pSetCoeff(strPoly, nDiv(nCoeffNom, nCoeffDenom));
+                                                        break;
                                                 case FALSE:
                                                         if(hasNegCoeff)
@@ -2631 +2637 @@
                                                                 pSetCoeff(strPoly, nCoeff );
                                                         }
+                                                        break;
                                                                                                         
                                         }
@@ -2655 +2662 @@
 
 int gcone::counter=0;
-
-ideal gfan(ideal inputIdeal)
+int gfanHeuristic;
+ideal gfan(ideal inputIdeal, int h)
 {
         int numvar = pVariables; 
+        gfanHeuristic = h;
         
         enum searchMethod {