Changeset 825d79 in git

Timestamp:

Nov 22, 1999, 2:45:36 PM (24 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

b9852e81cb68a9fd3c0763e109b79e779ef2dffd

Parents:

8896c8d3b3c16233ca0935ff6c0f1ff4b9adca4f

Message:

bug fixed: zeros in elimination


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

File:

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

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.19 1999-11-22 12:40:03 Singular Exp $ */
+/* $Id: sparsmat.cc,v 1.20 1999-11-22 13:45:36 pohl Exp $ */
 
 /*
@@ -574 +574 @@
   if (tored != nrows)
     this->smToredElim();
-  if (act < y)
+  if (act <= y)
   {
     this->smFinalMult();
@@ -945 +945 @@
     loop                  // combine the chains a and b: p*a + w*b
     {
-      if (a->pos < b->pos)
-      {
-        res = res->n = a;
-        a = a->n;
-      }
-      else if (a->pos > b->pos)
-      {
-        res = res->n = smElemCopy(b);
-        res->m = smMult(b->m, w);
-        res->e = 1;
-        res->f = smPolyWeight(res);
-        b = b->n;
-      }
-      else
-      {
-        ha = smMult(a->m, p);
-        pDelete(&a->m);
-        hb = smMult(b->m, w);
-        ha = pAdd(ha, hb);
-        if (ha != NULL)
-        {
-          a->m = ha;
-          a->e = 1;
-          a->f = smPolyWeight(a);
-          res = res->n = a;
-          a = a->n;
-        }
-        else
-        {
-          smElemDelete(&a);
-        }
-        b = b->n;
-      }
-      if (b == NULL)
-      {
-        res->n = a;
-        break;
-      }
       if (a == NULL)
       {
@@ -995 +957 @@
         break;
       }
+      if (a->pos < b->pos)
+      {
+        res = res->n = a;
+        a = a->n;
+      }
+      else if (a->pos > b->pos)
+      {
+        res = res->n = smElemCopy(b);
+        res->m = smMult(b->m, w);
+        res->e = 1;
+        res->f = smPolyWeight(res);
+        b = b->n;
+      }
+      else
+      {
+        ha = smMult(a->m, p);
+        pDelete(&a->m);
+        hb = smMult(b->m, w);
+        ha = pAdd(ha, hb);
+        if (ha != NULL)
+        {
+          a->m = ha;
+          a->e = 1;
+          a->f = smPolyWeight(a);
+          res = res->n = a;
+          a = a->n;
+        }
+        else
+        {
+          smElemDelete(&a);
+        }
+        b = b->n;
+      }
+      if (b == NULL)
+      {
+        res->n = a;
+        break;
+      }
     }
     m_act[r->pos] = dumm->n;
@@ -1030 +1030 @@
     loop                  // combine the chains a and b: (hp,gp)*a(l) + hr*b(h)
     {
+      if (a == NULL)
+      {
+        do
+        {
+          res = res->n = smElemCopy(b);
+          x = SM_MULT(b->m, hr, m_res[ir]->m);
+          b = b->n;
+          if(ir) SM_DIV(x, m_res[ir]->m);
+          res->m = x;
+          res->e = e;
+          res->f = smPolyWeight(res);
+        } while (b != NULL);
+        break;
+      }
       if (a->pos < b->pos)
       {
@@ -1115 +1129 @@
         break;
       }
-      if (a == NULL)
-      {
-        do
-        {
-          res = res->n = smElemCopy(b);
-          x = SM_MULT(b->m, hr, m_res[ir]->m);
-          b = b->n;
-          if(ir) SM_DIV(x, m_res[ir]->m);
-          res->m = x;
-          res->e = e;
-          res->f = smPolyWeight(res);
-        } while (b != NULL);
-        break;
-      }
     }
     m_act[r->pos] = dumm->n;