Changeset 3ce7b6 in git for Singular

Timestamp:

Oct 26, 1999, 2:38:57 PM (25 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

d6681d7c1532c8fdeadf659cf2603fd00f949139

Parents:

70433b5a54091cef5a9460d2a25a863a310e7319

Message:

memory-bug fixed


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

File:

• Singular/sparsmat.cc (modified) (3 diffs)

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.15 1999-10-22 11:14:17 obachman Exp $ */
+/* $Id: sparsmat.cc,v 1.16 1999-10-26 12:38:57 pohl Exp $ */
 
 /*
@@ -1008 +1008 @@
   smpoly r = red;         // row to reduce
   smpoly res, a, b;
-  poly ha, hr, gc, x, y;
+  poly ha, hr, x, y;
   int e, ip, ir, ia, lev;
 
@@ -1046 +1046 @@
       else
       {
-        y = NULL;
-        x = hr;
         ha = a->m;
         ia = a->e;
-        if (ir > ia)
-        {
-          gc = SM_MULT(ha, m_res[ir]->m, m_res[ia]->m);
+        if (ir >= ia)
+        {
+          if (ir > ia)
+          {
+            x = SM_MULT(ha, m_res[ir]->m, m_res[ia]->m);
+            pDelete(&ha);
+            ha = x;
+            if (ia) SM_DIV(ha, m_res[ia]->m);
+            ia = ir;
+          }
+          x = SM_MULT(ha, gp, m_res[ia]->m);
           pDelete(&ha);
-          ha = gc;
+          y = SM_MULT(b->m, hr, m_res[ia]->m);
+        }
+        else if (ir >= ip)
+        {
+          if (ia < crd)
+          {
+            x = SM_MULT(ha, m_res[crd]->m, m_res[ia]->m);
+            pDelete(&ha);
+            ha = x;
+            SM_DIV(ha, m_res[ia]->m);
+          }
+          y = hp;
+          if(ir > ip)
+          {
+            y = SM_MULT(y, m_res[ir]->m, m_res[ip]->m);
+            if (ip) SM_DIV(y, m_res[ip]->m);
+          }
+          ia = ir;
+          x = SM_MULT(ha, y, m_res[ia]->m);
+          if (y != hp) pDelete(&y);
+          pDelete(&ha);
+          y = SM_MULT(b->m, hr, m_res[ia]->m);
+        }
+        else
+        {
+          x = SM_MULT(hr, m_res[ia]->m, m_res[ir]->m);
+          if (ir) SM_DIV(x, m_res[ir]->m);
+          y = SM_MULT(b->m, x, m_res[ia]->m);
+          pDelete(&x);
+          x = SM_MULT(ha, gp, m_res[ia]->m);
+          pDelete(&ha);
+        }
+        ha = pAdd(x, y);
+        if (ha != NULL)
+        {
           if (ia) SM_DIV(ha, m_res[ia]->m);
-          ia = ir;
-        }
-        else if (ir < ia)
-        {
-          if (ip < ia)
-          {
-            gc = SM_MULT(ha, m_res[crd]->m, m_res[ia]->m);
-            pDelete(&ha);
-            ha = gc;
-            if (ia) SM_DIV(ha, m_res[ia]->m);
-            y = hp;
-            ia = ip;
-            if (ir > ia)
-            {
-              y = SM_MULT(y, m_res[ir]->m, m_res[ia]->m);
-              if (ia) SM_DIV(y, m_res[ia]->m);
-              ia = ir;
-            }
-            else if (ir < ia)
-            {
-              x = SM_MULT(x, m_res[ia]->m, m_res[ir]->m);
-              if (ir) SM_DIV(x, m_res[ir]->m);
-            }
-          }
-          else
-          {
-            x = SM_MULT(x, m_res[ia]->m, m_res[ir]->m);
-            if (ir) SM_DIV(x, m_res[ir]->m);
-          }
-        }
-        if (y == NULL) y = gp;
-        gc = SM_MULT(ha, y, m_res[ia]->m);
-        pDelete(&ha);
-        x = SM_MULT(x, b->m, m_res[ia]->m);
-        x = pAdd(x, gc);
-        if (x != NULL)
-        {
-          if (ia) SM_DIV(x, m_res[ia]->m);
-          a->m = x;
+          a->m = ha;
           a->e = e;
           a->f = smPolyWeight(a);