Changeset cea6f3 in git for kernel/p_Mult_mm__T.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_mm__T.cc (modified) (3 diffs)

kernel/p_Mult_mm__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_mm__T.cc,v 1.1.1.1 2003-10-06 12:16:00 Singular Exp $
+ *  Version: $Id: p_Mult_mm__T.cc,v 1.2 2006-01-13 18:10:05 wienand Exp $
  *******************************************************************/
 
@@ -19 +19 @@
 LINKAGE poly p_Mult_mm(poly p, const poly m, const ring ri)
 {
+  poly before = p;
   p_Test(p, ri);
   p_LmTest(m, ri);
@@ -33 +34 @@
   {
     pn = pGetCoeff(p);
-    pSetCoeff0(p, n_Mult(ln, pn, ri));
-    n_Delete(&pn, ri);
-    p_MemAdd(p->exp, m_e, length);
-    p_MemAddAdjust(p, ri);
-    p = pNext(p);
+    number tmp = n_Mult(ln, pn, ri);
+#ifdef HAVE_RING2TOM
+    if (n_IsZero(tmp, ri)) {
+      if (before == p) {
+        p = pNext(p);
+        before = p;
+        q = p;
+      }
+      else {
+        pNext(before) = pNext(p);
+        p_LmFree(p, ri);
+        p = pNext(before);
+      }
+    }
+    else
+#endif
+    {
+      pSetCoeff0(p, tmp);
+      n_Delete(&pn, ri);
+      p_MemAdd(p->exp, m_e, length);
+      p_MemAddAdjust(p, ri);
+#ifdef HAVE_RING_2TOM
+      before = p;
+#endif
+      p = pNext(p);
+    }
   }
   p_Test(q, ri);