Changeset d5a51a in git

Timestamp:

Mar 3, 1999, 5:58:09 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f6eebb578332a2cc6857c866460671e3d9373120

Parents:

f7343f357a06c50ebc347cc64f33a37193d88d12

Message:

*hannes: 1. try to fix bareiss/classify_l.tst


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

File:

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

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.2 1999-02-24 13:25:19 pohl Exp $ */
+/* $Id: sparsmat.cc,v 1.3 1999-03-03 16:58:09 Singular Exp $ */
 
 /*
@@ -187 +187 @@
   }
   sparse_mat *bareiss = new sparse_mat(II);
+  ideal mm=II;
   intvec *v;
   ideal m;
 
-  idDelete(&II);
   if (bareiss->smGetAct() == NULL)
   {
-    Free((ADDRESS)res, sizeof(slists));
     if (origR!=NULL)
     {
@@ -202 +201 @@
       Free((ADDRESS)tmpR.block1,3*sizeof(int));
     }
-    return NULL;
-  }
-  bareiss->smNewBareiss(x, y);
-  m = bareiss->smRes2Mod();
-  v = new intvec(bareiss->smGetRed());
-  bareiss->smToIntvec(v);
-  delete bareiss;
-  ideal mm;
-  if (origR!=NULL)
-  {
-    rChangeCurrRing(origR,TRUE);
-    mm=idInit(IDELEMS(m),m->rank);
-    int k;
-    for (k=0;k<IDELEMS(m);k++) mm->m[k] = pFetchCopy(origR, m->m[k]);
-    rChangeCurrRing(&tmpR,FALSE);
-    idDelete(&m);
-    rChangeCurrRing(origR,TRUE);
-    rUnComplete(&tmpR);
-    Free((ADDRESS)tmpR.order,3*sizeof(int));
-    Free((ADDRESS)tmpR.block0,3*sizeof(int));
-    Free((ADDRESS)tmpR.block1,3*sizeof(int));
   }
   else
   {
-    mm=m;
+    idDelete(&II);
+    bareiss->smNewBareiss(x, y);
+    m = bareiss->smRes2Mod();
+    v = new intvec(bareiss->smGetRed());
+    bareiss->smToIntvec(v);
+    delete bareiss;
+    if (origR!=NULL)
+    {
+      rChangeCurrRing(origR,TRUE);
+      mm=idInit(IDELEMS(m),m->rank);
+      int k;
+      for (k=0;k<IDELEMS(m);k++) mm->m[k] = pFetchCopy(origR, m->m[k]);
+      rChangeCurrRing(&tmpR,FALSE);
+      idDelete(&m);
+      rChangeCurrRing(origR,TRUE);
+      rUnComplete(&tmpR);
+      Free((ADDRESS)tmpR.order,3*sizeof(int));
+      Free((ADDRESS)tmpR.block0,3*sizeof(int));
+      Free((ADDRESS)tmpR.block1,3*sizeof(int));
+    }
+    else
+    {
+      mm=m;
+    }
   }
   res->Init(2);
@@ -249 +250 @@
   {
     m_act = NULL;
-    WerrorS("module expected");
     return;
   }