Changeset 3a9e92a in git

Timestamp:

Dec 18, 2013, 4:50:21 PM (9 years ago)

Author:

Christian Eder

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

7e2f2d4d596a804ea1786814516bb72ef3fa5d24

Parents:

6e3023af87cd7303404f428f8b9a5e633065747b

Message:

1. adds/brings back p_ExpVectorAddSub() which is useful in sba
2. uses p_ExpVectorAddSub() in sba

Files:

• kernel/kspoly.cc (modified) (2 diffs)
• kernel/polys.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

kernel/kspoly.cc

@@ -223 +223 @@
   if (!PW->is_sigsafe)
   {
-    poly ftmp;
-    ring rtmp;
-    PR->SetLmCurrRing();
-    poly f1 = pCopy(PR->GetLmCurrRing());
-    //PR->GetLm(ftmp,rtmp);
-    //poly f1 = k_LmInit_tailRing_2_currRing(ftmp,rtmp);
-    poly f2 = PW->GetLmCurrRing();
     poly sigMult = pCopy(PW->sig);   // copy signature of reducer
-    p_ExpVectorSub(f1, f2, currRing); // Calculate the Monomial we must multiply to p2
 //#if 1
 #ifdef DEBUGF5
@@ -240 +232 @@
     printf("--------------\n");
 #endif
-    sigMult = p_Mult_q(f1,sigMult,currRing);
+    p_ExpVectorAddSub(sigMult,PR->GetLmCurrRing(),PW->GetLmCurrRing(),currRing);
 //#if 1
 #ifdef DEBUGF5

kernel/polys.h

@@ -80 +80 @@
  ***************************************************************/
 
-#define pExpVectorCopy(d_p, s_p)    p_ExpVectorCopy(d_p, s_p, currRing)
-#define pExpVectorAdd(p1, p2)       p_ExpVectorAdd(p1, p2, currRing)
-#define pExpVectorSub(p1, p2)       p_ExpVectorSub(p1, p2, currRing)
-#define pExpVectorAddSub(p1, p2, p3)p_ExpVectorAddSub(p1, p2, p3, currRing)
-#define pExpVectorSum(pr, p1, p2)   p_ExpVectorSum(pr, p1, p2, currRing)
-#define pExpVectorDiff(pr, p1, p2)  p_ExpVectorDiff(pr, p1, p2, currRing)
+#define pExpVectorCopy(d_p, s_p)      p_ExpVectorCopy(d_p, s_p, currRing)
+#define pExpVectorAdd(p1, p2)         p_ExpVectorAdd(p1, p2, currRing)
+#define pExpVectorSub(p1, p2)         p_ExpVectorSub(p1, p2, currRing)
+#define pExpVectorAddSub(p1, p2, p3)  p_ExpVectorAddSub(p1, p2, p3, currRing)
+#define pExpVectorSum(pr, p1, p2)     p_ExpVectorSum(pr, p1, p2, currRing)
+#define pExpVectorDiff(pr, p1, p2)    p_ExpVectorDiff(pr, p1, p2, currRing)
 
 // Gets a copy of (resp. set) the exponent vector, where e is assumed

libpolys/polys/monomials/p_polys.h

@@ -1376 +1376 @@
 }
 // ExpVector(p1) += ExpVector(p2) - ExpVector(p3)
-//static inline void p_ExpVectorAddSub(poly p1, poly p2, poly p3, const ring r)
-//{
-//  p_LmCheckPolyRing1(p1, r);
-//  p_LmCheckPolyRing1(p2, r);
-//  p_LmCheckPolyRing1(p3, r);
-//#if PDEBUG >= 1
-//  for (int i=1; i<=r->N; i++)
-//    pAssume1(p_GetExp(p1, i, r) + p_GetExp(p2, i, r) >= p_GetExp(p3, i, r));
-//  pAssume1(p_GetComp(p1, r) == 0 ||
-//           (p_GetComp(p2, r) - p_GetComp(p3, r) == 0) ||
-//           (p_GetComp(p1, r) == p_GetComp(p2, r) - p_GetComp(p3, r)));
-//#endif
-//
-//  p_MemAddSub_LengthGeneral(p1->exp, p2->exp, p3->exp, r->ExpL_Size);
-//  // no need to adjust in case of NegWeights
-//}
+static inline void p_ExpVectorAddSub(poly p1, poly p2, poly p3, const ring r)
+{
+  p_LmCheckPolyRing1(p1, r);
+  p_LmCheckPolyRing1(p2, r);
+  p_LmCheckPolyRing1(p3, r);
+#if PDEBUG >= 1
+  for (int i=1; i<=r->N; i++)
+    pAssume1(p_GetExp(p1, i, r) + p_GetExp(p2, i, r) >= p_GetExp(p3, i, r));
+    pAssume1(p_GetComp(p1, r) == 0 ||
+           (p_GetComp(p2, r) - p_GetComp(p3, r) == 0) ||
+           (p_GetComp(p1, r) == p_GetComp(p2, r) - p_GetComp(p3, r)));
+#endif
+
+  p_MemAddSub_LengthGeneral(p1->exp, p2->exp, p3->exp, r->ExpL_Size);
+  // no need to adjust in case of NegWeights
+}
 
 // ExpVector(pr) = ExpVector(p1) - ExpVector(p2)