Changeset 670e639 in git for Singular/dyn_modules/gfanlib/tropicalTraversal.cc

Timestamp:

Feb 1, 2015, 7:02:48 PM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

44d34b600fd8727833693222ffbd36ce803e3e60

Parents:

5510099a60c7cd4cb8ef47b8e583ed11e4b4ffe3

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2015-02-01 19:02:48+01:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2015-02-06 13:47:06+01:00

Message:

chg: fixed delete for Groebner cones

File:

• Singular/dyn_modules/gfanlib/tropicalTraversal.cc (modified) (6 diffs)

Singular/dyn_modules/gfanlib/tropicalTraversal.cc

@@ -48 +48 @@
   workingList.insert(startingCone);
   const tropicalStrategy* currentStrategy=startingCone.getTropicalStrategy();
+  std::cout << "starting traversal" << std::endl;
   while(!workingList.empty())
   {
-    // std::cout << "starting traversal" << std::endl;
     /**
      * Pick an element the working list and compute interior points on its facets
      */
+    std::cout << "picking cone and computing interior facet points..." << std::endl;
     groebnerCone sigma=*(workingList.begin());
     gfan::ZMatrix interiorPoints = interiorPointsOfFacets(sigma.getPolyhedralCone());
@@ -66 +67 @@
       {
         ideal inI = initial(sigma.getPolynomialIdeal(),sigma.getPolynomialRing(),interiorPoint);
+        std::cout << "picking interiorPoint and computing rays of tropical star..." << std::endl;
         gfan::ZMatrix normalVectors = raysOfTropicalStar(inI,
                                                          sigma.getPolynomialRing(),
@@ -72 +74 @@
         id_Delete(&inI,sigma.getPolynomialRing());
 
+        std::cout << "checking for th neccessity to flip..." << std::endl;
         std::vector<bool> needToFlip = checkNecessaryFlips(tropicalVariety,workingList,interiorPoint,normalVectors);
         for (int j=0; j<normalVectors.getHeight(); j++)
@@ -77 +80 @@
           if (needToFlip[j])
           {
+            std::cout << "flipping cone..." << std::endl;
             groebnerCone neighbour = sigma.flipCone(interiorPoint,normalVectors[j]);
             workingList.insert(neighbour);
@@ -87 +91 @@
     workingList.erase(sigma);
     tropicalVariety.insert(sigma);
-    // std::cout << "tropicalVariety.size():" << tropicalVariety.size() << std::endl;
-    // std::cout << "workingList.size():" << workingList.size() << std::endl;
+    std::cout << "tropicalVariety.size():" << tropicalVariety.size() << std::endl;
+    std::cout << "workingList.size():" << workingList.size() << std::endl;
   }
   return tropicalVariety;
@@ -98 +102 @@
   groebnerCones workingList;
   workingList.insert(startingCone);
+  std::cout << "starting traversal" << std::endl;
   while(!workingList.empty())
   {
-    // std::cout << "starting traversal" << std::endl;
     const groebnerCone sigma=*(workingList.begin());
     const groebnerCones neighbours = sigma.tropicalNeighbours();