Changeset be1e92 in git

Timestamp:

Dec 2, 2010, 4:08:00 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

4e75784f0d5e941b4a716274f7236f53348703e1

Parents:

34ab5f65915ea1dfa21855f73940082f660d5855

Message:

code cleanup: smElim

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

File:

• kernel/sparsmat.cc (modified) (1 diff)

kernel/sparsmat.cc

@@ -840 +840 @@
 /* ----------------- elimination ------------------ */
 
-/* steps of elimination */
-void sparse_mat::smElim()
-{
-  poly p = piv->m;        // pivotelement
-  smpoly c = m_act[act];  // pivotcolumn
-  smpoly r = red;         // row to reduce
-  poly q;
-  smpoly res, a, b;
-  poly w, ha, hb;
-  int i;
-
-  if (oldpiv != NULL) q = oldpiv->m; // previous pivot
-  else q = NULL;
-  if ((c == NULL) || (r == NULL))
-  {
-    while (r) smElemDelete(&r);
-    for (i=1; i<act; i++)
-    {
-      a = m_act[i];
-      while (a != NULL)
-      {
-        ha = SM_MULT(a->m, p, q);
-        pDelete(&a->m);
-        if (q) SM_DIV(ha, q);
-        a->m = ha;
-        a = a->n;
-      }
-    }
-    return;
-  }
-  for (i=1; i<act; i++)
-  {
-    a = m_act[i];
-    if ((r == NULL) || (i != r->pos))  // cols without elimination
-    {
-      while (a != NULL)
-      {
-        ha = SM_MULT(a->m, p, q);
-        pDelete(&a->m);
-        if (q) SM_DIV(ha, q);
-        a->m = ha;
-        a = a->n;
-      }
-    }
-    else                    // cols with elimination
-    {
-      res = dumm;
-      res->n = NULL;
-      b = c;
-      w = r->m;
-      loop                  // combine the chains a and b: p*a + w*b
-      {
-        if (a == NULL)
-        {
-          if (b != NULL)
-          {
-            do
-            {
-              res = res->n = smElemCopy(b);
-              hb = SM_MULT(b->m, w, q);
-              if (q) SM_DIV(hb, q);
-              res->m = hb;
-              b = b->n;
-            } while (b != NULL);
-          }
-          else
-            res->n = NULL;
-          break;
-        }
-        if (b == NULL)
-        {
-          do
-          {
-            ha = SM_MULT(a->m, p, q);
-            pDelete(&a->m);
-            if (q) SM_DIV(ha, q);
-            a->m = ha;
-            res = res->n = a;
-            a = a->n;
-          } while (a != NULL);
-          break;
-        }
-        if (a->pos < b->pos)
-        {
-          ha = SM_MULT(a->m, p, q);
-          pDelete(&a->m);
-          if (q) SM_DIV(ha, q);
-          a->m = ha;
-          res = res->n = a;
-          a = a->n;
-        }
-        else if (a->pos > b->pos)
-        {
-          res = res->n = smElemCopy(b);
-          hb = SM_MULT(b->m, w, q);
-          b = b->n;
-          if (q) SM_DIV(hb, q);
-          res->m = hb;
-        }
-        else
-        {
-          ha = SM_MULT(a->m, p, q);
-          pDelete(&a->m);
-          hb = SM_MULT(b->m, w, q);
-          ha = pAdd(ha, hb);
-          if (ha != NULL)
-          {
-            if (q) SM_DIV(ha, q);
-            a->m = ha;
-            res = res->n = a;
-            a = a->n;
-          }
-          else
-          {
-            smElemDelete(&a);
-          }
-          b = b->n;
-        }
-      }
-      m_act[i] = dumm->n;
-      if (r) smElemDelete(&r);
-    }
-  }
-}
-
 /* first step of elimination */
 void sparse_mat::sm1Elim()