Changeset 85bcd6 in git

Timestamp:

Aug 1, 2012, 5:21:12 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d828d633862fd9b6ec0e9f7b7e95dc3d610527d0fcb5bfd57f91ed4e8f9022cad3b9a32ee509c968

Parents:

6ce030f7be001f1ad6bba7026beec10e5beac410

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-08-01 17:21:12+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-08-01 19:55:33+02:00

Message:

added p_LmShortDivisibleByNoComp by analogy

add: also needed pDebugLmShortDivisibleByNoComp and p_LmDivisibleByNoComp (with 2 rings) for completeness

Location:

libpolys/polys

Files:

• monomials/p_polys.h (modified) (3 diffs)
• pDebug.cc (modified) (2 diffs)

libpolys/polys/monomials/p_polys.h

@@ -1659 +1659 @@
   return _p_LmDivisibleByNoComp(a, b, r);
 }
+
+static inline BOOLEAN p_LmDivisibleByNoComp(poly a, const ring ra, poly b, const ring rb)
+{
+  p_LmCheckPolyRing1(a, ra);
+  p_LmCheckPolyRing1(b, rb);
+  return _p_LmDivisibleByNoComp(a, ra, b, rb);
+}
+
 static inline BOOLEAN p_LmDivisibleBy(poly a, poly b, const ring r)
 {
@@ -1692 +1700 @@
   return _p_LmDivisibleBy(a, r_a, b, r_b);
 }
+
 static inline BOOLEAN p_LmShortDivisibleBy(poly a, unsigned long sev_a,
                                     poly b, unsigned long not_sev_b, const ring r)
@@ -1709 +1718 @@
 #else
   return pDebugLmShortDivisibleBy(a, sev_a, r, b, not_sev_b, r);
+#endif
+}
+
+static inline BOOLEAN p_LmShortDivisibleByNoComp(poly a, unsigned long sev_a,
+                                           poly b, unsigned long not_sev_b, const ring r)
+{
+  p_LmCheckPolyRing1(a, r);
+  p_LmCheckPolyRing1(b, r);
+#ifndef PDIV_DEBUG
+  _pPolyAssume2(p_GetShortExpVector(a, r) == sev_a, a, r);
+  _pPolyAssume2(p_GetShortExpVector(b, r) == ~ not_sev_b, b, r);
+
+  if (sev_a & not_sev_b)
+  {
+    pAssume1(p_LmDivisibleByNoComp(a, b, r) == FALSE);
+    return FALSE;
+  }
+  return p_LmDivisibleByNoComp(a, b, r);
+#else
+  return pDebugLmShortDivisibleByNoComp(a, sev_a, r, b, not_sev_b, r);
 #endif
 }

libpolys/polys/pDebug.cc

@@ -347 +347 @@
 static unsigned long pDivisibleBy_FALSE = 1;
 static unsigned long pDivisibleBy_ShortFalse = 1;
+
 BOOLEAN pDebugLmShortDivisibleBy(poly p1, unsigned long sev_1, ring r_1,
                                poly p2, unsigned long not_sev_2, ring r_2)
@@ -370 +371 @@
 }
 
+BOOLEAN pDebugLmShortDivisibleByNoComp(poly p1, unsigned long sev_1, ring r_1,
+                                       poly p2, unsigned long not_sev_2, ring r_2)
+{
+//  _pPolyAssume((p_GetComp(p1, r_1) == p_GetComp(p2, r_2)) || (p_GetComp(p1, r_1) == 0));
+  _pPolyAssume(p_GetShortExpVector(p1, r_1) == sev_1, p1, r_1);
+  _pPolyAssume(p_GetShortExpVector(p2, r_2) == ~ not_sev_2, p2, r_2);
+
+  pDivisibleBy_number++;
+  BOOLEAN ret;
+  if (r_1 == r_2)
+    ret = p_LmDivisibleByNoComp(p1, p2, r_1);
+  else
+    ret = p_LmDivisibleByNoComp(p1, r_1, p2, r_2);
+
+  if (! ret) pDivisibleBy_FALSE++;
+  if (sev_1 & not_sev_2)
+  {
+    pDivisibleBy_ShortFalse++;
+    if (ret)
+      dReportError("p1 divides p2, but sev's are wrong");
+  }
+  return ret;
+}
+
 void pPrintDivisbleByStat()
 {