Changeset 8c8c80 in git

Timestamp:

Apr 21, 2005, 6:25:28 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

6da9757a9ddb8e1b1cfef46b28b9d316d6c9bc75

Parents:

ea68edeac3df1990933790c9755d504d57154323

Message:

*hannes: ...


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

File:

• kernel/gring.cc (modified) (5 diffs)

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.22 2005-04-21 16:16:45 levandov Exp $
+ *  Version: $Id: gring.cc,v 1.23 2005-04-21 16:25:28 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -1965 +1965 @@
   }
   int i,j;
-  r->nc->MT = (matrix *)omAlloc0(r->N*(r->N-1)/2*sizeof(matrix));
-  r->nc->MTsize = (int *)omAlloc0(r->N*(r->N-1)/2*sizeof(int));
+  r->nc->MT = (matrix *)omAlloc0((r->N*(r->N-1))/2*sizeof(matrix));
+  r->nc->MTsize = (int *)omAlloc0((r->N*(r->N-1))/2*sizeof(int));
+  idTest(((ideal)r->nc->C));
   matrix COM = mpCopy(r->nc->C);
   poly p,q;
@@ -1988 +1989 @@
         IsNonComm = 1;
         p_Delete(&(MATELEM(COM,i,j)),r);
-        MATELEM(COM,i,j) = NULL;
+        //MATELEM(COM,i,j) = NULL; // done by p_Delete
         r->nc->MTsize[UPMATELEM(i,j,r->N)] = DefMTsize; /* default sizes */
         r->nc->MT[UPMATELEM(i,j,r->N)] = mpNew(DefMTsize, DefMTsize);
@@ -1994 +1995 @@
       /* set MT[i,j,1,1] to c_i_j*x_i*x_j + D_i_j */
       p = p_ISet(1,r); /* instead of     p = pOne(); */
-      p_SetCoeff(p,nCopy(pGetCoeff(MATELEM(r->nc->C,i,j))),r);
+      p_SetCoeff(p,n_Copy(pGetCoeff(MATELEM(r->nc->C,i,j)),r),r);
       p_SetExp(p,i,1,r);
       p_SetExp(p,j,1,r);
@@ -2002 +2003 @@
       MATELEM(r->nc->MT[UPMATELEM(i,j,r->N)],1,1) = nc_p_CopyPut(p,r);
       p_Delete(&p,r);
-      p = NULL;
+      // p = NULL;// done by p_Delete
     }
   }