Changeset b6b3d3 in git

Timestamp:

Feb 12, 2015, 11:53:35 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

9b46beddf45e066826f54f9c45475d22b6acfa15

Parents:

ba68419b3ac117ee2dadc0972c99d83101aa359be5fd095e7959549d6a23e7b4b88e0c4e818f0586

Message:

Merge pull request #697 from YueRen/tropicalstuff

chg: allow users to pass dp and ds as orderings + code cleanup suggested by Hans and Oleksandr

Files:

• Singular/dyn_modules/gfanlib/bbfan.cc (modified) (2 diffs)
• Singular/dyn_modules/gfanlib/tropical.cc (modified) (2 diffs)
• Singular/dyn_modules/gfanlib/tropicalStrategy.cc (modified) (4 diffs)
• Singular/dyn_modules/gfanlib/tropicalVariety.cc (modified) (3 diffs)
• gfanlib/gfanlib_zcone.cpp (modified) (1 diff)

Singular/dyn_modules/gfanlib/bbfan.cc

@@ -127 +127 @@
   int rr = iv->rows();
   bigintmat* ivCopy = new bigintmat(rr, cc, coeffs_BIGINT);
+  number temp1 = n_Init(1,coeffs_BIGINT);
   for (int r = 1; r <= rr; r++)
     for (int c = 1; c <= cc; c++)
     {
-      number temp1 = n_Init(1,coeffs_BIGINT);
       number temp2 = n_Sub(IMATELEM(*iv, r, c),temp1,coeffs_BIGINT);
       ivCopy->set(r,c,temp2);
-      n_Delete(&temp1,coeffs_BIGINT);
       n_Delete(&temp2,coeffs_BIGINT);
     }
+  n_Delete(&temp1,coeffs_BIGINT);
   gfan::ZMatrix* zm = bigintmatToZMatrix(ivCopy);
   gfan::IntMatrix im = gfan::IntMatrix(gfan::ZToIntMatrix(*zm));
@@ -463 +463 @@
 }
 
-BOOLEAN coneContaining(leftv res, leftv args)
-{
-  leftv u=args;
-  if ((u != NULL) && (u->Typ() == fanID))
-  {
-    leftv v=u->next;
-    if ((v != NULL) && ((v->Typ() == BIGINTMAT_CMD) || (v->Typ() == INTVEC_CMD)))
-    {
-      gfan::ZFan* zf = (gfan::ZFan*)u->Data();
-      gfan::ZVector* point;
-      if (v->Typ() == INTVEC_CMD)
-      {
-        intvec* w0 = (intvec*) v->Data();
-        bigintmat* w1 = iv2bim(w0,coeffs_BIGINT);
-        w1->inpTranspose();
-        point = bigintmatToZVector(*w1);
-        delete w1;
-      }
-      else
-      {
-        bigintmat* w1 = (bigintmat*) v->Data();
-        point = bigintmatToZVector(*w1);
-      }
-      lists L = (lists)omAllocBin(slists_bin);
-      res->rtyp = LIST_CMD;
-      res->data = (void*) L;
-      delete point;
-      return FALSE;
-    }
-  }
-  WerrorS("coneContaining: unexpected parameters");
-  return TRUE;
-}
+// BOOLEAN coneContaining(leftv res, leftv args)
+// {
+//   leftv u=args;
+//   if ((u != NULL) && (u->Typ() == fanID))
+//   {
+//     leftv v=u->next;
+//     if ((v != NULL) && ((v->Typ() == BIGINTMAT_CMD) || (v->Typ() == INTVEC_CMD)))
+//     {
+//       gfan::ZFan* zf = (gfan::ZFan*)u->Data();
+//       gfan::ZVector* point;
+//       if (v->Typ() == INTVEC_CMD)
+//       {
+//         intvec* w0 = (intvec*) v->Data();
+//         bigintmat* w1 = iv2bim(w0,coeffs_BIGINT);
+//         w1->inpTranspose();
+//         point = bigintmatToZVector(*w1);
+//         delete w1;
+//       }
+//       else
+//       {
+//         bigintmat* w1 = (bigintmat*) v->Data();
+//         point = bigintmatToZVector(*w1);
+//       }
+//       lists L = (lists)omAllocBin(slists_bin);
+//       res->rtyp = LIST_CMD;
+//       res->data = (void*) L;
+//       delete point;
+//       return FALSE;
+//     }
+//   }
+//   WerrorS("coneContaining: unexpected parameters");
+//   return TRUE;
+// }
 
 BOOLEAN removeCone(leftv res, leftv args)

Singular/dyn_modules/gfanlib/tropical.cc

@@ -67 +67 @@
 
 
+gfan::ZCone lowerHomogeneitySpace(ideal I, ring r)
+{
+  int n = rVar(r);
+  poly g;
+  int* leadexpv = (int*) omAlloc((n+1)*sizeof(int));
+  int* tailexpv = (int*) omAlloc((n+1)*sizeof(int));
+  gfan::ZVector leadexpw = gfan::ZVector(n);
+  gfan::ZVector tailexpw = gfan::ZVector(n);
+  gfan::ZMatrix equations = gfan::ZMatrix(0,n);
+  for (int i=0; i<IDELEMS(I); i++)
+  {
+    g = (poly) I->m[i];
+    if (g)
+    {
+      p_GetExpV(g,leadexpv,r);
+      leadexpw = intStar2ZVector(n,leadexpv);
+      pIter(g);
+      while (g)
+      {
+        p_GetExpV(g,tailexpv,r);
+        tailexpw = intStar2ZVector(n,tailexpv);
+        equations.appendRow(leadexpw-tailexpw);
+        pIter(g);
+      }
+    }
+  }
+  gfan::ZMatrix inequalities = gfan::ZMatrix(0,n);
+  gfan::ZVector lowerHalfSpaceCondition = gfan::ZVector(n);
+  lowerHalfSpaceCondition[0] = -1;
+  inequalities.appendRow(lowerHalfSpaceCondition);
+
+  omFreeSize(leadexpv,(n+1)*sizeof(int));
+  omFreeSize(tailexpv,(n+1)*sizeof(int));
+  return gfan::ZCone(inequalities,equations);
+}
+
+
+BOOLEAN lowerHomogeneitySpace(leftv res, leftv args)
+{
+  leftv u = args;
+  if ((u != NULL) && (u->Typ() == IDEAL_CMD))
+  {
+    leftv v = u->next;
+    if (v == NULL)
+    {
+      ideal I = (ideal) u->Data();
+      res->rtyp = coneID;
+      res->data = (void*) new gfan::ZCone(lowerHomogeneitySpace(I,currRing));
+      return FALSE;
+    }
+  }
+  WerrorS("lowerHomogeneitySpace: unexpected parameters");
+  return TRUE;
+}
+
+
 gfan::ZCone groebnerCone(const ideal I, const ring r, const gfan::ZVector &w)
 {
@@ -268 +324 @@
   p->iiAddCproc("","maximalGroebnerCone",FALSE,maximalGroebnerCone);
   p->iiAddCproc("","homogeneitySpace",FALSE,homogeneitySpace);
+  p->iiAddCproc("","lowerHomogeneitySpace",FALSE,lowerHomogeneitySpace);
   p->iiAddCproc("","initial",FALSE,initial);
   // p->iiAddCproc("","tropicalNeighbours",FALSE,tropicalNeighbours);

Singular/dyn_modules/gfanlib/tropicalStrategy.cc

@@ -174 +174 @@
   s->wvhdl[0] = (int*) omAlloc(n*sizeof(int));
   s->wvhdl[0][0] = 1;
-  for (int i=1; i<n; i++)
-    s->wvhdl[0][i] = -(r->wvhdl[0][i-1]);
+  if (r->order[0] == ringorder_dp)
+  {
+    for (int i=1; i<n; i++)
+      s->wvhdl[0][i] = -1;
+  }
+  else if (r->order[0] == ringorder_ds)
+  {
+    for (int i=1; i<n; i++)
+      s->wvhdl[0][i] = 1;
+  }
+  else if (r->order[0] == ringorder_ws)
+  {
+    for (int i=1; i<n; i++)
+      s->wvhdl[0][i] = r->wvhdl[0][i-1];
+  }
+  else
+  {
+    for (int i=1; i<n; i++)
+      s->wvhdl[0][i] = -r->wvhdl[0][i-1];
+  }
   s->order[1] = ringorder_C;
 
@@ -182 +200 @@
   return s;
 }
-
-#if 0 /*unused*/
-static ring writeOrderingAsWP(ring r)
-{
-  assume(r->order[0]==ringorder_wp || r->order[0]==ringorder_dp);
-  if (r->order[0]==ringorder_dp)
-  {
-    ring s = rCopy0(r,FALSE,TRUE);
-    rComplete(s);
-    rTest(s);
-    return s;
-  }
-  return rCopy(r);
-}
-#endif
 
 static ideal constructStartingIdeal(ideal originalIdeal, ring originalRing, number uniformizingParameter, ring startingRing)
@@ -222 +225 @@
   omFreeSize(shiftByOne,(n+1)*sizeof(int));
 
-  ring origin = currRing;
-  rChangeCurrRing(startingRing);
-  ideal startingIdeal = kNF(pt,startingRing->qideal,J);
-  rChangeCurrRing(origin);
+  // ring origin = currRing;
+  // rChangeCurrRing(startingRing);
+  // ideal startingIdeal = kNF(pt,startingRing->qideal,J);
+  // rChangeCurrRing(origin);
+  ideal startingIdeal = J; J = NULL;
   assume(startingIdeal->m[k]==NULL);
   startingIdeal->m[k] = pt->m[0];
@@ -867 +871 @@
   originalIdeal(NULL),
   expectedDimension(NULL),
-  linealitySpace(gfan::ZCone()), // to come, see below
-  startingRing(NULL),            // to come, see below
-  startingIdeal(NULL),           // to come, see below
-  uniformizingParameter(NULL),   // to come, see below
-  shortcutRing(NULL),            // to come, see below
+  linealitySpace(gfan::ZCone()),
+  startingRing(NULL),
+  startingIdeal(NULL),
+  uniformizingParameter(NULL),
+  shortcutRing(NULL),
   onlyLowerHalfSpace(false)
 {

Singular/dyn_modules/gfanlib/tropicalVariety.cc

@@ -89 +89 @@
     {
       setOptionRedSB();
-      ideal stdI;
-      if (!hasFlag(u,FLAG_STD))
-        stdI = gfanlib_kStd_wrapper(I,currRing);
-      else
-        stdI = id_Copy(I,currRing);
+      // ideal stdI;
+      // if (!hasFlag(u,FLAG_STD))
+      //   stdI = gfanlib_kStd_wrapper(I,currRing);
+      // else
+      //   stdI = id_Copy(I,currRing);
       tropicalStrategy currentStrategy(I,currRing);
       gfan::ZFan* tropI = tropicalVariety(currentStrategy);
@@ -99 +99 @@
       res->data = (char*) tropI;
       undoSetOptionRedSB();
-      id_Delete(&stdI,currRing);
+      // id_Delete(&stdI,currRing);
       return FALSE;
     }
@@ -105 +105 @@
     {
       number p = (number) v->Data();
-      ideal stdI;
-      if (!hasFlag(u,FLAG_STD))
-        stdI = gfanlib_kStd_wrapper(I,currRing);
-      else
-        stdI = id_Copy(I,currRing);
-      tropicalStrategy currentStrategy(stdI,p,currRing);
-      // tropicalStrategy currentStrategy(I,p,currRing);
+      // ideal stdI;
+      // if (!hasFlag(u,FLAG_STD))
+      //   stdI = gfanlib_kStd_wrapper(I,currRing);
+      // else
+      //   stdI = id_Copy(I,currRing);
+      // tropicalStrategy currentStrategy(stdI,p,currRing);
+      tropicalStrategy currentStrategy(I,p,currRing);
       gfan::ZFan* tropI = tropicalVariety(currentStrategy);
       res->rtyp = fanID;
       res->data = (char*) tropI;
-      id_Delete(&stdI,currRing);
+      // id_Delete(&stdI,currRing);
       return FALSE;
     }

gfanlib/gfanlib_zcone.cpp

@@ -23 +23 @@
 #include <setoper.h>
 #include <cdd.h>
-#endif
-#endif
+#endif //HAVE_CDDLIB_SETOPER_H
+#endif //HAVE_CDD_SETOPER_H
 
 namespace gfan{