Changeset 78abc7 in git for Singular/dyn_modules/gfanlib/tropicalStrategy.cc

Timestamp:

Aug 18, 2014, 4:35:01 PM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', '2fa36c576e6a4ddbb1093b43c7f8e9835e17e52a')

Children:

eacb78146504ca284c1888c739cb1aade67c8520

Parents:

441944f17f356b9a04c768f8a43754bc29364747

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2014-08-18 16:35:01+02:00

git-committer:

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

Message:

chg: status update 18.08.

File:

• Singular/dyn_modules/gfanlib/tropicalStrategy.cc (modified) (3 diffs)

Singular/dyn_modules/gfanlib/tropicalStrategy.cc

@@ -8 +8 @@
 #include <kernel/ideals.h>
 #include <kernel/GBEngine/stairc.h>
+#include <Singular/ipshell.h> // for isPrime(int i)
 
 /***
@@ -56 +57 @@
   startingIdeal(id_Copy(originalIdeal,originalRing)),
   uniformizingParameter(NULL),
-  shortcutRing(rCopy(originalRing)),
+  shortcutRing(NULL),
   onlyLowerHalfSpace(false),
   weightAdjustingAlgorithm1(nonvalued_adjustWeightForHomogeneity),
@@ -137 +138 @@
   originalRing = rCopy(s);
 
-  /* replace Q with Z for the startingRing */
-  startingRing = rCopy0(originalRing);
-  nKillChar(startingRing->cf);
-  startingRing->cf = nInitChar(n_Z,NULL);
-  rComplete(startingRing);
-
-  /* map p into the new coefficient domain */
+  /* replace Q with Z for the startingRing
+   * and add an extra variable for tracking the uniformizing parameter */
+  startingRing = constructStartingRing(originalRing);
+
+  /* map the uniformizing parameter into the new coefficient domain */
   nMapFunc nMap = n_SetMap(originalRing->cf,startingRing->cf);
   uniformizingParameter = nMap(q,originalRing->cf,startingRing->cf);
 
-  /* map J into the new polynomial ring */
+  /* map the input ideal into the new polynomial ring */
   int k = idSize(J);
-  startingIdeal = idInit(k);
+  startingIdeal = idInit(k+1);
+  poly g = p_One(startingRing);
+  p_SetCoeff(g,uniformizingParameter,startingRing);
+  pNext(g) = p_One(startingRing);
+  p_SetExp(pNext(g),1,1,startingRing);
+  p_SetCoeff(pNext(g),n_Init(-1,startingRing->cf),startingRing);
+  p_Setm(pNext(g),startingRing);
+  startingIdeal->m[0] = g;
+  int n = rVar(originalRing);
+  int* shiftByOne = (int*) omAlloc((n+1)*sizeof(int));
+  for (int i=1; i<=n; i++)
+    shiftByOne[i]=i+1;
   for (int i=0; i<k; i++)
-    startingIdeal->m[i] = p_PermPoly(J->m[i],NULL,originalRing,startingRing,nMap,NULL,0);
+    startingIdeal->m[i+1] = p_PermPoly(J->m[i],shiftByOne,originalRing,startingRing,nMap,NULL,0);
+  omFreeSize(shiftByOne,(n+1)*sizeof(int));
+
+  /* construct the shorcut ring */
+  shortcutRing = rCopy0(startingRing);
+  nKillChar(shortcutRing->cf);
+  shortcutRing->cf = nInitChar(n_Zp,(void*)(long)IsPrime(n_Int(uniformizingParameter,startingRing->cf)));
+  rComplete(shortcutRing);
 
   /* compute the dimension of the ideal in the original ring */