Changeset bc4605 in git

Timestamp:

Jun 30, 1999, 4:42:39 PM (24 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

3932494a14100776dd25479d8a30fd56fb8ea293

Parents:

54ef19be93941a1f50a58f040b1314ee4a5a27e5

Message:

bugs for bareiss with 3 arguments


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

File:

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

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.9 1999-06-22 11:24:02 pohl Exp $ */
+/* $Id: sparsmat.cc,v 1.10 1999-06-30 14:42:39 pohl Exp $ */
 
 /*
@@ -1271 +1271 @@
     j++;
     if (j > act) break;
-    if (m_act[i]->pos > tored)
-    {
-      m_res[inred] = m_act[i];
+    if (m_act[j]->pos > tored)
+    {
+      m_res[inred] = m_act[j];
       inred--;
     }
@@ -1303 +1303 @@
       perm[crd+i] = a->pos;
       a = a->n;
-    } while (a != NULL);
+    } while ((a != NULL) && (a->pos <= tored));
     for (j=act-1;j;j--) // load all positions of perm
     {
@@ -1319 +1319 @@
           }
           a = a->n;
-          if (a == NULL) break;
+          if ((a == NULL) || (a->pos > tored)) break;
         }
         k++;
-        if (k > i)
+        if ((k > i) && (a->pos <= tored))
         {
           do
@@ -1329 +1329 @@
             perm[crd+i] = a->pos;
             a = a->n;
-          } while (a != NULL);
+          } while ((a != NULL) && (a->pos <= tored));
           break;
         }
@@ -1382 +1382 @@
     act--;
   }
-  for (i=1;i<=nrows;i++) // take the rest of m_row
+  for (i=1;i<=tored;i++) // take the rest of m_row
   {
     if(m_row[i] != NULL)
@@ -1402 +1402 @@
             h->n = NULL;
             h->pos = tored;
+            break;
+          }
+          ap = a;
+        }
+      } while (r!=NULL);
+    }
+  }
+  for (i=tored+1;i<=nrows;i++) // take the rest of m_row
+  {
+    if(m_row[i] != NULL)
+    {
+      r = m_row[i];
+      m_row[i] = NULL;
+      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 = i;
             break;
           }