Changeset 78abc7 in git

Timestamp:

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

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')

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.

Location:

Singular/dyn_modules/gfanlib

Files:

• groebnerCone.cc (modified) (1 diff)
• ppinitialReduction.cc (modified) (9 diffs)
• startingCone.cc (modified) (2 diffs)
• tropicalStrategy.cc (modified) (3 diffs)
• tropicalStrategy.h (modified) (1 diff)
• tropicalTraversal.cc (modified) (1 diff)

Singular/dyn_modules/gfanlib/groebnerCone.cc

@@ -34 +34 @@
     int n = rVar(r); int* w = r->wvhdl[0];
     gfan::ZVector v = wvhdlEntryToZVector(n,w);
+    if (r->order[0]==ringorder_ws)
+      v = gfan::Integer((long)-1)*v;
     if (!zc.contains(v))
     {

Singular/dyn_modules/gfanlib/ppinitialReduction.cc

@@ -19 +19 @@
 static bool pReduce(poly &g, const number p, const ring r)
 {
+  if (g==NULL)
+    return false;
+
   poly toBeChecked = pNext(g);
   pNext(g) = NULL; poly gEnd = g;
@@ -107 +110 @@
 bool ppreduceInitially(poly &h, const poly g, const ring r)
 {
+  if (h==NULL || g==NULL)
+    return false;
   p_Test(h,r);
   p_Test(g,r);
@@ -204 +209 @@
     for (int j=i+1; j<m; j++)
       if (ppreduceInitially(I->m[i], I->m[j],r) && pReduce(I->m[i],p,r)) return true;
+
+  /***
+   * removes the elements of I which have been reduced to 0 in the previous two passes
+   **/
+  idSkipZeroes(I);
   return false;
 }
@@ -249 +259 @@
   int n=idSize(I);
   idInsertPoly(I,g);
-  poly cache; n++; int j;
-  for (j=n-1; j>0; j--)
+  int j;
+  for (j=n; j>0; j--)
   {
     if (p_LmCmp(I->m[j], I->m[j-1],r)>0)
     {
-      cache = I->m[j];
+      poly cache = I->m[j];
       I->m[j] = I->m[j-1];
       I->m[j-1] = cache;
@@ -281 +291 @@
     if (ppreduceInitially(I->m[j], I->m[k], r) && pReduce(I->m[j],p,r)) return true;
 
+  /***
+   * removes the elements of I which have been reduced to 0 in the previous two passes
+   **/
+  idSkipZeroes(I);
   return false;
 }
@@ -475 +489 @@
 
 
-/***
+/**
  * reduces I initially with respect to itself.
  * assumes that the generators of I are homogeneous in x and that p-t is in I.
- **/
+ */
 bool ppreduceInitially(ideal I, ring r, number p)
 {
@@ -498 +512 @@
     else
     {
-      std::pair<std::map<long,ideal>::iterator,bool> ret;
-      ret = H.insert(std::pair<long,ideal>(d,idInit(16)));
-      idInsertPoly(ret.first->second,I->m[i]);
+      std::pair<long,ideal> Hd(d,idInit(1));
+      Hd.second->m[0] = I->m[i];
+      H.insert(Hd);
     }
   }
@@ -506 +520 @@
   std::map<long,ideal>::iterator it=H.begin();
   ideal Hi = it->second;
+  assume(idSize(Hi)==1);
+  assume(pLength(Hi->m[0])==2);
+  it++;
+  Hi = it->second;
 
   /***
@@ -520 +538 @@
   {
     int l=idSize(Hi); int k=l; poly cache;
+    /**
+     * sorts Hi according to degree in t in descending order
+     * (lowest first, highest last)
+     */
     do
     {

Singular/dyn_modules/gfanlib/startingCone.cc

@@ -52 +52 @@
 std::pair<gfan::ZVector,groebnerCone> tropicalStartingDataViaGroebnerFan(const ideal I, const ring r, const tropicalStrategy& currentStrategy)
 {
+  std::cout << "computing starting cone" << std::endl;
   currentStrategy.reduce(I,r);
+  std::cout << "finished reduction" << std::endl;
 
   const groebnerCone sigma(I,r,currentStrategy);
+  std::cout << "finished first maximal Groebner cone" << std::endl;
   gfan::ZVector startingPoint = sigma.tropicalPoint();
   if (startingPoint.size() > 0)
@@ -64 +67 @@
   while (!workingList.empty())
   {
+    std::cout << "traversing groebner fan..." << std::endl;
     const groebnerCone sigma = *(workingList.begin());
     groebnerCones neighbours = sigma.groebnerNeighbours();

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 */

Singular/dyn_modules/gfanlib/tropicalStrategy.h

@@ -207 +207 @@
     return b;
   }
+
+  /**
+   * returns true, if I contains a monomial.
+   * returns false otherwise.
+   **/
+  bool containsMonomial(ideal I, ring r) const
+  {
+    ring rFinite = rCopy0(r);
+    nKillChar(rFinite.coeffs());
+    rFinite->cf =
+  }
 };
 

Singular/dyn_modules/gfanlib/tropicalTraversal.cc

@@ -8 +8 @@
   while(!workingList.empty())
   {
+    std::cout << "starting traversal" << std::endl;
     const groebnerCone sigma=*(workingList.begin());
     const groebnerCones neighbours = sigma.tropicalNeighbours();