Changeset 3fe215 in git

Timestamp:

Jul 25, 2014, 12:54:08 PM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

441944f17f356b9a04c768f8a43754bc29364747

Parents:

fb1872063d432246ad1af6b42c33a4c083f68071

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2014-07-25 12:54:08+02:00

git-committer:

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

Message:

chg: startingPoint algorithm

changed so that for principal ideals or ideals whose tropical variety is trivial,
the startingPoint machinery is no longer used, instead it will immediately return a point

Location:

Singular/dyn_modules/gfanlib

Files:

• startingCone.cc (modified) (2 diffs)
• tropicalStrategy.h (modified) (1 diff)

Singular/dyn_modules/gfanlib/startingCone.cc

@@ -9 +9 @@
 #include <tropicalCurves.h>
 #include <bbcone.h>
+#include <tropicalVarietyOfPolynomials.h>
 #include <tropicalVariety.h>
 
@@ -84 +85 @@
     ideal I = (ideal) u->Data();
     tropicalStrategy currentStrategy(I,currRing);
-    if (currentStrategy.getDimensionOfIdeal()==currentStrategy.getDimensionOfHomogeneitySpace())
-    {
-      gfan::ZCone homogSpace = currentStrategy.getHomogeneitySpace();
-      gfan::ZMatrix homogSpaceGenerators = homogSpace.generatorsOfLinealitySpace();
-      assume(homogSpaceGenerators.getHeight()>0);
+    if (idSize(I)==1)
+    {
+      poly g = I->m[0];
+      std::set<gfan::ZCone> Tg = tropicalVariety(g,currRing,currentStrategy);
+      if (Tg.empty())
+      {
+        res->rtyp = BIGINTMAT_CMD;
+        res->data = (void*) zVectorToBigintmat(gfan::ZVector(0));
+        return FALSE;
+      }
+      gfan::ZCone C = *(Tg.begin());
+      gfan::ZMatrix rays = C.extremeRays();
+      if (rays.getHeight()==0)
+      {
+        gfan::ZMatrix lin = C.generatorsOfLinealitySpace();
+        res->rtyp = BIGINTMAT_CMD;
+        res->data = (void*) zVectorToBigintmat(lin[0]);
+        return FALSE;
+      }
       res->rtyp = BIGINTMAT_CMD;
-      res->data = (void*) zVectorToBigintmat(homogSpaceGenerators[0]);
+      res->data = (void*) zVectorToBigintmat(rays[0]);
+      return FALSE;
+    }
+    gfan::ZCone C0 = currentStrategy.getHomogeneitySpace();
+    if (C0.dimension()==currentStrategy.getDimensionOfIdeal())
+    {
+      gfan::ZMatrix lin = C0.generatorsOfLinealitySpace();
+      res->rtyp = BIGINTMAT_CMD;
+      res->data = (void*) zVectorToBigintmat(lin[0]);
       return FALSE;
     }

Singular/dyn_modules/gfanlib/tropicalStrategy.h

@@ -21 +21 @@
   number uniformizingParameter;
   gfan::ZCone linealitySpace;
+
   bool onlyLowerHalfSpace;