Changeset e0cb6c in git

Timestamp:

Oct 4, 2010, 10:47:47 AM (14 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

d322f7f690342c6a4c286ae7a938ccccacacb7f3

Parents:

a990f52adef334d4f73400116e91e4d0ec764bcd

Message:

*motsak: Fixing the bug (http://www.singular.uni-kl.de:8002/trac/ticket/233)

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

File:

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

kernel/gring.cc

@@ -989 +989 @@
   int k,m;
   int rN=r->N;
-  matrix cMT=r->GetNC()->MT[UPMATELEM(j,i,rN)];         /* cMT=current MT */
+  const int cMTindex = UPMATELEM(j,i,rN);
+  matrix cMT=r->GetNC()->MT[cMTindex];         /* cMT=current MT */
 
   poly x=pOne();p_SetExp(x,j,1,r);p_Setm(x,r);
@@ -1011 +1012 @@
        //        t=p_Copy(MATELEM(cMT,k-1,1),r);
        t = gnc_mm_Mult_p(y,t,r);
+       cMT=r->GetNC()->MT[cMTindex]; // since multiplication can change the MT table...
+       assume( t != NULL );
+#ifdef PDEBUG
+       p_Test(t,r);
+#endif
        MATELEM(cMT,k,1) = nc_p_CopyPut(t,r);
        //        omCheckAddr(cMT->m);
@@ -1025 +1031 @@
     {
       t = nc_p_CopyGet(MATELEM(cMT,a,m-1),r);
+      assume( t != NULL );
       //      t=p_Copy(MATELEM(cMT,a,m-1),r);
       t = gnc_p_Mult_mm(t,x,r);
+      cMT=r->GetNC()->MT[cMTindex]; // since multiplication can change the MT table...
+#ifdef PDEBUG
+      p_Test(t,r);
+#endif
       MATELEM(cMT,a,m) = nc_p_CopyPut(t,r);
       //      MATELEM(cMT,a,m) = t;
@@ -1036 +1047 @@
   p_Delete(&x,r);
   p_Delete(&y,r);
-  //  t=MATELEM(cMT,a,b);
-  t= nc_p_CopyGet(MATELEM(cMT,a,b),r);
+  t=MATELEM(cMT,a,b);
+  assume( t != NULL );
+  
+  t= nc_p_CopyGet(t,r);
+#ifdef PDEBUG
+  p_Test(t,r);
+#endif
   //  return(p_Copy(t,r));
   /* since the last computed element was cMT[a,b] */