Changeset 805feb in git

Timestamp:

Feb 5, 2015, 9:14:18 AM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5d0cbde5a46435543fb6098ae4b46629d3f54b87

Parents:

8979e0ad7532ffe1c5d21bdd5b3fdcb4aef3cb2b

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2015-02-05 09:14:18+01:00

git-committer:

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

Message:

chg: removed redundant tropical curves computation

Location:

Singular/dyn_modules/gfanlib

Files:

• bbcone.cc (modified) (4 diffs)
• bbcone.h (modified) (1 diff)
• tropicalTraversal.cc (modified) (3 diffs)

Singular/dyn_modules/gfanlib/bbcone.cc

@@ -1621 +1621 @@
  * Computes a relative interior point for each facet of zc
  **/
-gfan::ZMatrix interiorPointsOfFacets(const gfan::ZCone zc)
+gfan::ZMatrix interiorPointsOfFacets(const gfan::ZCone &zc, const std::set<gfan::ZVector> &exceptThese)
 {
   gfan::ZMatrix inequalities = zc.getFacets();
@@ -1639 +1639 @@
   newEquations.appendRow(inequalities[0]);
   gfan::ZCone facet = gfan::ZCone(newInequalities,newEquations);
-  relativeInteriorPoints.appendRow(facet.getRelativeInteriorPoint());
+  facet.canonicalize();
+  gfan::ZVector interiorPoint = facet.getRelativeInteriorPoint();
+  if (exceptThese.count(interiorPoint)==0)
+    relativeInteriorPoints.appendRow(interiorPoint);
 
   /* these are the cases i=1,...,r-2 */
@@ -1649 +1652 @@
     newEquations.appendRow(inequalities[i]);
     facet = gfan::ZCone(newInequalities,newEquations);
-    relativeInteriorPoints.appendRow(facet.getRelativeInteriorPoint());
+    facet.canonicalize();
+    interiorPoint = facet.getRelativeInteriorPoint();
+    if (exceptThese.count(interiorPoint)==0)
+      relativeInteriorPoints.appendRow(interiorPoint);
   }
 
@@ -1657 +1663 @@
   newEquations.appendRow(inequalities[r-1]);
   facet = gfan::ZCone(newInequalities,newEquations);
-  relativeInteriorPoints.appendRow(facet.getRelativeInteriorPoint());
+  facet.canonicalize();
+  interiorPoint = facet.getRelativeInteriorPoint();
+  if (exceptThese.count(interiorPoint)==0)
+    relativeInteriorPoints.appendRow(interiorPoint);
 
   return relativeInteriorPoints;

Singular/dyn_modules/gfanlib/bbcone.h

@@ -20 +20 @@
 gfan::ZVector randomPoint(const gfan::ZCone* zc);
 gfan::ZCone liftUp(const gfan::ZCone &zc);
-gfan::ZMatrix interiorPointsOfFacets(const gfan::ZCone zc);
+gfan::ZMatrix interiorPointsOfFacets(const gfan::ZCone &zc, const std::set<gfan::ZVector> &exceptThese=std::set<gfan::ZVector>());
 
 #endif

Singular/dyn_modules/gfanlib/tropicalTraversal.cc

@@ -48 +48 @@
   workingList.insert(startingCone);
   const tropicalStrategy* currentStrategy=startingCone.getTropicalStrategy();
+  std::set<gfan::ZVector> finishedInteriorPoints;
   while(!workingList.empty())
   {
@@ -54 +55 @@
      */
     groebnerCone sigma=*(workingList.begin());
-    gfan::ZMatrix interiorPoints = interiorPointsOfFacets(sigma.getPolyhedralCone());
+    gfan::ZMatrix interiorPoints = interiorPointsOfFacets(sigma.getPolyhedralCone(),finishedInteriorPoints);
 
     for (int i=0; i<interiorPoints.getHeight(); i++)
@@ -81 +82 @@
         }
       }
+      finishedInteriorPoints.insert(interiorPoint);
     }