Changeset c6aeb1 in git

Timestamp:

Sep 25, 2016, 1:06:15 PM (8 years ago)

Author:

Yue <ren@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

45bb8fb89dd5e57b8fe8519b7bd36128192db306

Parents:

12aa9a7684247f22e527acba99afa8e1cf3acb34

git-author:

Yue <ren@mathematik.uni-kl.de>2016-09-25 13:06:15+02:00

git-committer:

Yue <ren@mathematik.uni-kl.de>2016-09-27 07:29:55+02:00

Message:

fix: startingCone bug found by Simon Keicher

File:

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

Singular/dyn_modules/gfanlib/startingCone.cc

@@ -13 +13 @@
 #include <tropicalVariety.h>
 #include <tropicalStrategy.h>
+#include <std_wrapper.h>
 
 
@@ -332 +333 @@
 }
 
+
+ring createTraversalStartingRing(const ring s, const gfan::ZMatrix &startingPoints, const tropicalStrategy& currentStrategy)
+{
+  // copy r except qideal (which should be 0) and ordering
+  ring s0 = rCopy0(s);
+  int n = rVar(s);
+  deleteOrdering(s0);
+  bool ok;
+
+  // adjust weight and create new ordering
+  int h = startingPoints.getHeight();
+  s0->order = (int*) omAlloc0((h+3)*sizeof(int));
+  s0->block0 = (int*) omAlloc0((h+3)*sizeof(int));
+  s0->block1 = (int*) omAlloc0((h+3)*sizeof(int));
+  s0->wvhdl = (int**) omAlloc0((h+3)*sizeof(int**));
+  for (int i=0; i<h; i++)
+  {
+    s0->order[i] = ringorder_a;
+    s0->block0[i] = 1;
+    s0->block1[i] = n;
+    s0->wvhdl[i] = ZVectorToIntStar(startingPoints[i],ok);
+  }
+  s0->order[h] = ringorder_lp;
+  s0->block0[h] = 1;
+  s0->block1[h] = n;
+  s0->order[h+1] = ringorder_C;
+
+  rComplete(s0);
+  rTest(s0);
+
+  return s0;
+}
+
+
 /***
  * Computes a starting cone in the tropical variety.
@@ -361 +396 @@
     // equals the dimension of the tropical variety
     gfan::ZCone zc = linealitySpaceOfGroebnerFan(inI,s);
-    gfan::ZVector startingPoint; groebnerCone ambientMaximalCone;
+    gfan::ZMatrix startingPoints(0,rVar(r));
+    groebnerCone ambientMaximalCone;
     if (zc.dimension()>=currentStrategy.getExpectedDimension())
     {
@@ -382 +418 @@
       // compute a point in the tropical variety outside the lineality space
       std::pair<gfan::ZVector,groebnerCone> startingData = tropicalStartingDataViaGroebnerFan(inI,s,currentStrategy);
-      startingPoint = startingData.first;
+      gfan::ZVector startingPoint = startingData.first;
+      startingPoints.appendRow(startingPoint);
       ambientMaximalCone = groebnerCone(startingData.second);
 
@@ -399 +436 @@
     // from this we can read of the inequalities and equations
 
+    ring s0 = createTraversalStartingRing(s,startingPoints,currentStrategy);
+    nMapFunc identity = n_SetMap(s->cf,s0->cf);
+    k = IDELEMS(inI);
+    ideal inI0 = idInit(k);
+    for (int i=0; i<k; i++)
+      inI0->m[i] = p_PermPoly(inI->m[i],NULL,s,s0,identity,NULL,0);
+
+    identity = n_SetMap(r->cf,s0->cf);
+    k = IDELEMS(I);
+    ideal I0 = idInit(k);
+    for (int i=0; i<k; i++)
+      I0->m[i] = p_PermPoly(I->m[i],NULL,r,s0,identity,NULL,0);
+
+
     // but before doing so, we must lift the generating set of inI
     // to a generating set of I
-    ideal J = lift(I,r,inI,s); // todo: use computeLift from tropicalStrategy
-    groebnerCone startingCone(J,inI,s,currentStrategy);
-    id_Delete(&inI,s);
-    id_Delete(&J,s);
+    // ideal J0 = lift(I,r,inI0,s0); // todo: use computeLift from tropicalStrategy
+    ideal J0 = gfanlib_kStd_wrapper(I0,s0);
+    assume(areIdealsEqual(J0,s0,I,r));
+    id_Delete(&I0,s0);
+    groebnerCone startingCone(J0,inI0,s0,currentStrategy);
+    id_Delete(&J0,s0);
+    id_Delete(&inI0,s0);
+    rDelete(s0);
 
     // assume(checkContainmentInTropicalVariety(startingCone));