Changeset 9a596d in git for Singular/sparsmat.cc

Timestamp:

Jun 4, 1999, 3:06:28 PM (24 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

650ffc4b7f35bd1a1609ce69829132028efa017a

Parents:

c801beb15dbf5f6a7997a33c6be813e2a7b471c1

Message:

det for sparse, bug fix


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

File:

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

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.6 1999-06-02 14:09:34 pohl Exp $ */
+/* $Id: sparsmat.cc,v 1.7 1999-06-04 13:06:28 pohl Exp $ */
 
 /*
@@ -119 +119 @@
   void smPivDel();
   void smSign();
+  void smInitPerm();
 public:
   sparse_mat(ideal);
@@ -395 +396 @@
     return res;
   }
+  this->smInitPerm();
   this->smPivot();
   this->smSign();
@@ -400 +402 @@
   this->sm1Elim();
   crd++;
+  m_res[crd] = piv;
   this->smColDel();
   act--;
@@ -410 +413 @@
   if (act < 2)
   {
+    this->smFinalMult();
+    this->smPivDel();
     if (act != 0) res = m_act[1]->m;
     Free((void *)m_act[1], sizeof(smprec));
@@ -416 +421 @@
   loop
   {
-    m_res[crd] = piv;
     this->smNewPivot();
     this->smSign();
@@ -423 +427 @@
     this->smHElim();
     crd++;
+    m_res[crd] = piv;
     this->smColDel();
     act--;
@@ -434 +439 @@
     if (act < 2)
     {
+      this->smFinalMult();
       this->smPivDel();
       if (act != 0) res = m_act[1]->m;
@@ -1376 +1382 @@
 void sparse_mat::smFinalMult()
 {
-  smpoly a = m_act[act];
-  int e = crd;
+  smpoly a;
   poly ha;
   int i, f;
+  int e = crd;
 
   for (i=act; i; i--)
@@ -1456 +1462 @@
 void sparse_mat::smPivDel()
 {
-  int i=crd-1;
+  int i=crd;
 
   while (i != 0)
@@ -1470 +1476 @@
 void sparse_mat::smSign()
 {
-  int j,i=1;
-  if (cpiv!=act) sign=-sign;
-  if ((act%2)==0) sign=-sign;
-  j=perm[1];
-  while(j<rpiv)
-  {
-    sign=-sign;
-    i++;
-    j=perm[i];
-  }
-  while(perm[i]!=0)
-  {
-    perm[i]=perm[i+1];
-    i++;
-  }
+  int j,i;
+  if (act > 2)
+  {
+    if (cpiv!=act) sign=-sign;
+    if ((act%2)==0) sign=-sign;
+    i=1;
+    j=perm[1];
+    while(j<rpiv)
+    {
+      sign=-sign;
+      i++;
+      j=perm[i];
+    }
+    while(perm[i]!=0)
+    {
+      perm[i]=perm[i+1];
+      i++;
+    }
+  }
+  else
+  {
+    if (cpiv!=1) sign=-sign;
+    if (rpiv!=perm[1]) sign=-sign;
+  }
+}
+
+void sparse_mat::smInitPerm()
+{
+  int i;
+  for (i=act;i;i--) perm[i]=i;
 }
 
@@ -2071 +2092 @@
   }
 }
+