Changeset 07b6ac in git

Timestamp:

Feb 6, 2008, 1:51:41 PM (16 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9b107f9206df58706364a2dae65b07124f9aa017

Parents:

8f2bd1fc11ce18b5be7a734f75309011e212a4d3

Message:

rmodulon.cc:
Change in init/setexp

p_Mult_mm__T.cc:
memory loss


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

Location:

kernel

Files:

• p_Mult_mm__T.cc (modified) (5 diffs)
• rmodulon.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.6 2007-05-10 08:12:42 wienand Exp $
+ *  Version: $Id: p_Mult_mm__T.cc,v 1.7 2008-02-06 12:51:41 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);
@@ -31 +30 @@
   pAssume(!n_IsZero(ln,ri));
 
+#ifdef HAVE_ZERODIVISORS
+  poly before = p;
+#endif
   while (p != NULL)
   {
@@ -38 +40 @@
     if (n_IsZero(tmp, ri))
     {
+      n_Delete(&tmp, ri);
       if (before == p)
       {
-        p = pNext(p);
+        p = p_LmDeleteAndNext(p, ri);
         before = p;
         q = p;
@@ -46 +49 @@
       else
       {
-        pNext(before) = pNext(p);
-        p_LmFree(p, ri);
-        p = pNext(before);
+        p = p_LmDeleteAndNext(p, ri);
+        pNext(before) = p;
       }
     }

kernel/rmodulon.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulon.cc,v 1.17 2008-02-06 09:12:47 wienand Exp $ */
+/* $Id: rmodulon.cc,v 1.18 2008-02-06 12:51:41 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -346 +346 @@
   nrnBase = r->ringflaga;
   nrnExponent = r->ringflagb;
-  if (nrnModul != NULL)
-  {
-    nrnDelete((number*) &nrnModul, NULL);
-    nrnDelete((number*) &nrnMinusOne, NULL);
-  }
-  nrnModul = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
-  mpz_init(nrnModul);
+  if (nrnModul == NULL)
+  {
+    nrnModul = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+    mpz_init(nrnModul);
+    nrnMinusOne = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+    mpz_init(nrnMinusOne);
+  }
   mpz_set_ull(nrnModul, nrnBase);
   mpz_pow_ui(nrnModul, nrnModul, nrnExponent);
-
-  nrnMinusOne = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
-  mpz_init(nrnMinusOne);
   mpz_sub_ui(nrnMinusOne, nrnModul, 1);
 }
@@ -366 +363 @@
   if (mpz_cmp_ui(nrnModul,2) <= 0)
   {
-    WarnS("nInitChar failed");
+    WarnS("nInitExp failed");
   }
 }