Changeset b71400a in git for Singular/dyn_modules/gfanlib/tropicalStrategy.h

Timestamp:

Sep 15, 2014, 11:08:21 AM (10 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dffd1541cc74564f509bd5d284948852484430b0

Parents:

9c03260ac0404405e4994f73b30ef46f079535d8

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2014-09-15 11:08:21+02:00

git-committer:

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

Message:

chg: status update 15.09.

File:

• Singular/dyn_modules/gfanlib/tropicalStrategy.h (modified) (6 diffs)

Singular/dyn_modules/gfanlib/tropicalStrategy.h

@@ -91 +91 @@
   bool (*extraReductionAlgorithm) (ideal I, ring r, number p);
 
+  ring copyAndChangeCoefficientRing(const ring r) const;
+  ring copyAndChangeOrderingWP(const ring r, const gfan::ZVector w, const gfan::ZVector v) const;
+  ring copyAndChangeOrderingLS(const ring r, const gfan::ZVector w, const gfan::ZVector v) const;
+
+  /**
+   * if valuation non-trivial, checks whether the generating system contains p-t
+   * otherwise returns true
+   */
+  bool checkForUniformizingBinomial(const ideal I, const ring r) const;
+
+  /**
+   * if valuation non-trivial, checks whether the genearting system contains p
+   * otherwise returns true
+   */
+  bool checkForUniformizingParameter(const ideal inI, const ring r) const;
+  int findPositionOfUniformizingBinomial(const ideal I, const ring r) const;
+  void putUniformizingBinomialInFront(ideal I, const ring r, const number q) const;
+
+
 public:
 
@@ -154 +173 @@
   ring getStartingRing() const
   {
-    rTest(startingRing);
+    if (startingRing) rTest(startingRing);
     return startingRing;
   }
@@ -186 +205 @@
   ring getShortcutRing() const
   {
-    rTest(shortcutRing);
+    if (shortcutRing) rTest(shortcutRing);
     return shortcutRing;
   }
@@ -258 +277 @@
   void changeCoefficientToResidueField(ring r) const;
 
-
-
   /**
    * reduces the generators of an ideal I so that
@@ -265 +282 @@
    */
   bool reduce(ideal I, const ring r) const;
+
+  bool pReduce(ideal I, const ring r) const;
 
   /**
@@ -292 +311 @@
    * computes the groebner cone adjacent to it
    */
-  std::pair<ideal,ring> getFlip(const ideal I, const ring r, const gfan::ZVector interiorPoint, const gfan::ZVector facetNormal) const;
-
-  /**
-   * checks whether the first elements of I is p-t
-   */
-  static bool checkFirstGenerator(ideal I, ring r)
-  {
-    // check for correct size of ideal and first generator
-    if (idSize(I)==0)
-    {
-      WerrorS("checkFirstElement: ideal empty");
-      return false;
-    }
-    poly p = I->m[0];
-    if (size(p)!=2)
-    {
-      WerrorS("checkFirstElement: no binomial");
-      return false;
-    }
-
-    // check first term
-    int n = rVar(r);
-    if (!n_IsUnit(p_GetCoeff(p,r->cf),r->cf))
-    {
-      WerrorS("checkFirstElement: wrong coefficient");
-      return false;
-    }
-    for (int i=1; i<=n; i++)
-    {
-      if (p_GetExp(p,i,r)!=0)
-      {
-        WerrorS("checkFirstElement: wrong exponent vector");
-        return false;
-      }
-    }
-
-    // check second term
-    pIter(p);
-    if (!n_IsOne(p_GetCoeff(p,r->cf),r->cf))
-    {
-      WerrorS("checkFirstElement: wrong coefficient");
-      return false;
-    }
-    if (p_GetExp(p,1,r)!=1)
-    {
-      WerrorS("checkFirstElement: wrong exponent vector");
-      return false;
-    }
-    for (int i=2; i<=n; i++)
-    {
-      if (p_GetExp(p,i,r)!=0)
-      {
-        WerrorS("checkFirstElement: wrong exponent vector");
-        return false;
-      }
-    }
-
-    return true;
-  }
+  std::pair<ideal,ring> getFlip(const ideal I, const ideal redI, const ring r, const gfan::ZVector interiorPoint, const gfan::ZVector facetNormal) const;
 };