Changeset cbeafc2 in git

Timestamp:

Nov 17, 2006, 3:31:07 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

f41bd90135713026d8a1ff50059a2d95d034bf52

Parents:

6ddd8a0a16f90b70564607ed32af027112fc1b37

Message:

*hannes: fix


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

Location:

kernel

Files:

• ideals.cc (modified) (5 diffs)
• matpol.cc (modified) (2 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.20 2006-06-28 15:06:49 Singular Exp $ */
+/* $Id: ideals.cc,v 1.21 2006-11-17 14:31:07 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2720 +2720 @@
 }
 
-// #define NEW_STUFF
+//#define NEW_STUFF
 #ifndef NEW_STUFF
 // converts mat to module, destroys mat
@@ -2761 +2761 @@
   poly h;
   poly p;
-  sBucket_pt bucket = sBucketInit(currRing);
+  sBucket_pt bucket = sBucketCreate(currRing);
 
   for(j=0;j<mc /*MATCOLS(mat)*/;j++) /* j is also index in result->m */
@@ -2771 +2771 @@
       {
         MATELEM(mat,i,j+1)=NULL;
-        p_SetCompP(h,i, currRing, &l);
+        p_SetCompP(h,i, currRing);
         sBucket_Merge_p(bucket, h, l);
       }
@@ -2777 +2777 @@
     sBucketClearMerge(bucket, &(result->m[j]), &l);
   }
+  sBucketDestroy(&bucket);
 
   // obachman: need to clean this up

kernel/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.7 2006-11-17 14:17:16 Singular Exp $ */
+/* $Id: matpol.cc,v 1.8 2006-11-17 14:31:06 Singular Exp $ */
 
 /*
@@ -217 +217 @@
       {
         poly a_p, b_p;
-        if (((a_p=MATELEM(a,i,k))!=NULL) || ((b_p=MATELEM(b,k,j))!=NULL))
+        if (((a_p=MATELEM(a,i,k))!=NULL) && ((b_p=MATELEM(b,k,j))!=NULL))
         {
           s = ppMult_qq(a_p /*MATELEM(a,i,k)*/, b_p/*MATELEM(b,k,j)*/);