Changeset cea6f3 in git for kernel/p_Mult_q.cc

Timestamp:

Jan 13, 2006, 7:10:06 PM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2e4de3d33d0bea3780e1932fdaf8a41c161f473e

Parents:

4cbb61ba5014a593b9bc6569b497e9a8151bc15f

Message:

RING2TOM Merger


git-svn-id: file:///usr/local/Singular/svn/trunk@8900 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/p_Mult_q.cc (modified) (5 diffs)

kernel/p_Mult_q.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_q.cc,v 1.1.1.1 2003-10-06 12:16:00 Singular Exp $
+ *  Version: $Id: p_Mult_q.cc,v 1.2 2006-01-13 18:10:05 wienand Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -165 +165 @@
 
   poly res = pp_Mult_mm(p,q,r);     // holds initially q1*p
+#ifdef HAVE_RING2TOM
+  if (res == NULL) {
+    res = p_ISet(1, r);
+    p_SetCoeff(res, (number) 0, r);
+  }
+#endif
   poly qq = pNext(q);               // we iter of this
   poly qn = pp_Mult_mm(qq, p,r);    // holds p1*qi
@@ -174 +180 @@
   // now the main loop
   Top:
+#ifdef HAVE_RING2TOM
+  if (qn == NULL && rn == NULL) goto Work;
+  if (qn == NULL) goto Greater;
+#endif
   if (rn == NULL) goto Smaller;
   p_LmCmpAction(rn, qn, r, goto Equal, goto Greater, goto Smaller);
@@ -188 +198 @@
   rr = qn;
   pIter(qn);
+
   Work: // compute res + Lm(qq)*pp
   if (rn == NULL)
@@ -226 +237 @@
     p_Delete(&q, r);
   }
+#ifdef HAVE_RING2TOM
+  if (n_IsZero(p_GetCoeff(res, r), r)) {
+    res = p_LmDeleteAndNext(res, r);
+  }
+#endif
   p_Test(res, r);
   return res;