Changeset e744d9 in git for Singular/dyn_modules/gfanlib/startingCone.cc

Timestamp:

Jul 17, 2014, 12:28:18 PM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

eb836ceccfffe01622457439ed104bca800bc101

Parents:

3c0aa5079c417e92fdfaa03c1d87d73f5b365291

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2014-07-17 12:28:18+02:00

git-committer:

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

Message:

chg: status update 17.07.

File:

• Singular/dyn_modules/gfanlib/startingCone.cc (modified) (4 diffs)

Singular/dyn_modules/gfanlib/startingCone.cc

@@ -40 +40 @@
  * containing the point.
  **/
-std::pair<gfan::ZVector,groebnerCone> tropicalStartingPointViaGroebnerFan(const ideal I, const ring r, const tropicalStrategy& currentStrategy)
+std::pair<gfan::ZVector,groebnerCone> tropicalStartingDataViaGroebnerFan(const ideal I, const ring r, const tropicalStrategy& currentStrategy)
 {
   currentStrategy.reduce(I,r);
@@ -84 +84 @@
     ideal I = (ideal) u->Data();
     tropicalStrategy currentStrategy(I,currRing);
-    std::pair<gfan::ZVector,groebnerCone> startingData = tropicalStartingPointViaGroebnerFan(I,currRing,currentStrategy);
+    std::pair<gfan::ZVector,groebnerCone> startingData = tropicalStartingDataViaGroebnerFan(I,currRing,currentStrategy);
     gfan::ZVector startingPoint = startingData.first;
     res->rtyp = BIGINTMAT_CMD;
@@ -131 +131 @@
 
   gfan::ZCone zc = linealitySpaceOfGroebnerFan(inI,s);
-  gfan::ZVector potentialStartingPoint; groebnerCone ambientMaximalCone;
+  gfan::ZVector startingPoint; groebnerCone ambientMaximalCone;
   while (zc.dimension()<currentStrategy.getDimensionOfIdeal())
   {
-    std::pair<gfan::ZVector,groebnerCone> startingData = tropicalStartingPointViaGroebnerFan(inI,s,currentStrategy);
-    potentialStartingPoint = startingData.first;
+    std::pair<gfan::ZVector,groebnerCone> startingData = tropicalStartingDataViaGroebnerFan(inI,s,currentStrategy);
+    startingPoint = startingData.first;
     ambientMaximalCone = groebnerCone(startingData.second);
 
@@ -142 +142 @@
     s = ambientMaximalCone.getPolynomialRing();
 
-    inI = sloppyInitial(inI,s,potentialStartingPoint);
+    inI = sloppyInitial(inI,s,startingPoint);
     zc = linealitySpaceOfGroebnerFan(inI,s);
   }
 
   ideal J = lift(I,r,inI,s);
+  groebnerCone tropicalStartingCone(J,inI,s,currentStrategy);
   id_Delete(&inI,s);
-  groebnerCone tropicalStartingCone(J,s,potentialStartingPoint,currentStrategy);
   id_Delete(&J,s);