Changeset 60763e in git

Timestamp:

Jun 10, 1999, 11:01:17 AM (24 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

dfd346fefacb74ceabb45bd6bcb026bc23d9acf0

Parents:

28f2d302b56d434cf41693253b775ee4d0d1703d

Message:

bug fixes


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

File:

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

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.7 1999-06-04 13:06:28 pohl Exp $ */
+/* $Id: sparsmat.cc,v 1.8 1999-06-10 09:01:17 pohl Exp $ */
 
 /*
@@ -44 +44 @@
 
 /* declare internal 'C' stuff */
-static void smDebug() { int k=0; }
 static void smExactPolyDiv(poly, poly);
 static BOOLEAN smIsScalar(const poly);
@@ -88 +87 @@
   int crd;             // number of reduced columns (start: 0)
   int tored;           // border for rows to reduce
+  int inred;           // unreducable part
   int rpiv, cpiv;      // position of the pivot
   unsigned short *perm;// permutation of rows
@@ -308 +308 @@
   }
   sign = 1;
-  act = ncols;
+  inred = act = ncols;
   crd = 0;
   tored = nrows; // without border
@@ -463 +463 @@
   if (act < y)
   {
-    if (act != 0)
-    {
-      this->smCopToRes();
-    }
+    this->smCopToRes();
     return;
   }
@@ -499 +496 @@
     if (act < y)
     {
-      if (act != 0)
-      {
-        this->smCopToRes();
-      }
-      else
-        tored = crd;
+      this->smCopToRes();
       return;
     }
@@ -525 +517 @@
   if (act < y)
   {
-    if (act != 0)
-    {
-      this->smCopToRes();
-    }
+    this->smCopToRes();
     return;
   }
@@ -562 +551 @@
     if (act < y)
     {
-      if (act != 0)
-      {
-        this->smFinalMult();
-        this->smCopToRes();
-      }
-      else
-        tored = crd;
+      this->smFinalMult();
+      this->smCopToRes();
       return;
     }
@@ -1257 +1241 @@
     if (m_act[i]->pos > tored)
     {
-      m_res[crd] = m_act[i];
-      crd++;
+      m_res[inred] = m_act[i];
+      inred--;
       break;
     }
@@ -1269 +1253 @@
     if (m_act[i]->pos > tored)
     {
-      m_res[crd] = m_act[i];
-      crd++;
+      m_res[inred] = m_act[i];
+      inred--;
     }
     else
@@ -1287 +1271 @@
 void sparse_mat::smCopToRes()
 {
-  smpoly p, r, ap, a, h;
-  int c, i;
-
-  if (act == 0) return;
-  if (act > 1)
-  {
-    Werror("Not implemented");
-  }
-  crd++;
-  c = crd;
-  p = m_res[c] = m_act[act];
-  do
-  {
-    r = m_row[p->pos];
-    m_row[p->pos] = NULL;
-    perm[c] = p->pos;
-    p->pos = c;
-    while (r != NULL)
-    {
-      ap = m_res[r->pos];
+  smpoly a,ap,r,h;
+  int i,j,k,l;
+
+  i = 0;
+  if (act)
+  {
+    a = m_act[act]; // init perm
+    do
+    {
+      i++;
+      perm[crd+i] = a->pos;
+      a = a->n;
+    } while (a != NULL);
+    for (j=act-1;j;j--) // load all positions of perm
+    {
+      a = m_act[j];
+      k = 1;
       loop
       {
-        a = ap->n;
-        if (a == NULL)
-        {
-          ap->n = h = r;
-          r = r->n;
-          h->n = a;
-          h->pos = c;
+        if (perm[crd+k] >= a->pos)
+        {
+          if (perm[crd+k] > a->pos)
+          {
+            for (l=i;l>=k;l--) perm[crd+l+1] = perm[crd+l];
+            perm[crd+k] = a->pos;
+            i++;
+          }
+          a = a->n;
+          if (a == NULL) break;
+        }
+        k++;
+        if (k > i)
+        {
+          do
+          {
+            i++;
+            perm[crd+i] = a->pos;
+            a = a->n;
+          } while (a != NULL);
           break;
         }
-        ap = a;
-      }
-    }
-    c++;
-    p = p->n;
-  } while (p != NULL);
-  for (i=1;i<=nrows;i++)
-  {
-    if(m_row[i] != NULL)
-    {
-      r = m_row[i];
-      m_row[i] = NULL;
+      }
+    }
+  }
+  tored = crd+i; // the number or permuted rows
+  for (j=act;j;j--) // renumber m_act
+  {
+    k = 1;
+    a = m_act[j];
+    do
+    {
+      if (perm[crd+k] == a->pos)
+      {
+        a->pos = crd+k;
+        a = a->n;
+      }
+      k++;
+    } while (a != NULL);
+  }
+  for(k=1;k<=i;k++) // clean this from m_row
+  {
+    j = perm[crd+k];
+    if (m_row[j] != NULL)
+    {
+      r = m_row[j];
+      m_row[j] = NULL;
       do
       {
@@ -1338 +1345 @@
           if (a == NULL)
           {
-            ap->n = h = r;
+            h = ap->n = r;
             r = r->n;
-            h->n = a;
-            h->pos = c;
+            h->n = NULL;
+            h->pos = crd+k;
             break;
           }
@@ -1347 +1354 @@
         }
       } while (r!=NULL);
-      c++;
-    }
-  }
-  tored = c-1;
+    }
+  }
+  while(act) // clean m_act
+  {
+    crd++;
+    m_res[crd] = m_act[act];
+    act--;
+  }
+  for (i=1;i<=nrows;i++) // take the rest of m_row
+  {
+    if(m_row[i] != NULL)
+    {
+      tored++;
+      r = m_row[i];
+      m_row[i] = NULL;
+      perm[tored] = i;
+      do
+      {
+        ap = m_res[r->pos];
+        loop
+        {
+          a = ap->n;
+          if (a == NULL)
+          {
+            h = ap->n = r;
+            r = r->n;
+            h->n = NULL;
+            h->pos = tored;
+            break;
+          }
+          ap = a;
+        }
+      } while (r!=NULL);
+    }
+  }
+  while (inred < ncols) // take unreducable
+  {
+    crd++;
+    inred++;
+    m_res[crd] = m_res[inred];
+  }
 }