Changeset f18d7db in git

Timestamp:

Jul 5, 2011, 11:35:27 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

faf58fa448fff6919168c75277259dc4202064b0

Parents:

fc15cc799d1c7198bd1e43daa447a104f50c43c0

Message:

use n_IsOne/n_isMOne, fix memory leaks with nCopy/nDiv, use nNormalize for better efficiency


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

File:

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

kernel/gring.cc

@@ -1414 +1414 @@
   /* pSetComp(m,r)=0? */
   poly   N  = nc_mm_Mult_p(m, p_Head(p1,r), r);
-  number C  = n_Copy( p_GetCoeff(N,  r), r);
-  number cF = n_Copy( p_GetCoeff(p2, r),r);
+  number C  = p_GetCoeff(N,  r);
+  number cF = p_GetCoeff(p2, r);
   /* GCD stuff */
   number cG = nGcd(C, cF, r);
-  if ( !nEqual(cG, n_Init(1,r) ) )
-  {
-    cF = nDiv(cF, cG);
-    C  = nDiv(C,  cG);
-  }
+  if ( !n_IsOne(cG,r) )
+  {
+    cF = nDiv(cF, cG); nNormalize(cF);
+    C  = nDiv(C,  cG); nNormalize(C);
+  }
+  else
+  {
+    cF = n_Copy(cF, r);
+    C  = n_Copy(C, r);
+  }
+  n_Delete(&cG,r);
   p2 = p_Mult_nn(p2, C, r);
   poly out = nc_mm_Mult_pp(m, pNext(p1), r);
@@ -1428 +1434 @@
   p_Test(p2,r);
   p_Test(N,r);
-  number MinusOne = n_Init(-1,r);
-  if (!n_Equal(cF,MinusOne,r))
+  if (!n_IsMOne(cF,r))
   {
     cF = n_Neg(cF,r);
@@ -1441 +1446 @@
   n_Delete(&cF,r);
   n_Delete(&C,r);
-  n_Delete(&MinusOne,r);
   return(out);
 
@@ -1471 +1475 @@
   poly   N  = nc_mm_Mult_p(m, p_Head(p1,r), r);
 
-  number C  = n_Copy( p_GetCoeff(N,  r), r);
-  number cF = n_Copy( p_GetCoeff(p2, r), r);
+  number C  =  p_GetCoeff(N,  r);
+  number cF =  p_GetCoeff(p2, r);
 
   /* GCD stuff */
@@ -1479 +1483 @@
   if (!n_IsOne(cG, r))
   {
-    number n_tmp;
-    n_tmp = n_Div(cF, cG, r); n_Delete(&cF,r); cF=n_tmp;
-    n_tmp  = n_Div(C,  cG, r); n_Delete(&C,r); C=n_tmp;
-  }
+    cF = n_Div(cF, cG, r); n_Normalize(cF,r);
+    C  = n_Div(C,  cG, r); n_Normalize(C,r);
+  }
+  else
+  {
+    cF = n_Copy(cF, r);
+    C  = n_Copy(C, r);
+  }
+  n_Delete(&cG,r);
 
   p2 = p_Mult_nn(p2, C, r); // p2 !!!
@@ -1552 +1561 @@
   /* zero exponents ! */
   poly M1    = nc_mm_Mult_p(m1,p_Head(p1,r),r);
-  number C1  = n_Copy(p_GetCoeff(M1,r),r);
+  number C1  = p_GetCoeff(M1,r);
   poly M2    = nc_mm_Mult_p(m2,p_Head(p2,r),r);
-  number C2  = n_Copy(p_GetCoeff(M2,r),r);
+  number C2  = p_GetCoeff(M2,r);
   /* GCD stuff */
   number C = nGcd(C1,C2,r);
-  if (!nEqual(C,n_Init(1,r)))
-  {
-    C1=nDiv(C1,C);
-    C2=nDiv(C2,C);
-  }
+  if (!nIsOne(C))
+  {
+    C1=nDiv(C1,C);nNormalize(C1);
+    C2=nDiv(C2,C);nNormalize(C1);
+  }
+  else
+  {
+    C1=nCopy(C1);
+    C2=nCopy(C2);
+  }
+  nDelete(&C);
   M1=p_Mult_nn(M1,C2,r);
   p_SetCoeff(m1,C2,r);
-  number MinusOne=n_Init(-1,r);
-  if (n_Equal(C1,MinusOne,r))
+  if (n_IsMOne(C1,r))
   {
     M2=p_Add_q(M1,M2,r);
@@ -1589 +1603 @@
   //  n_Delete(&C1,r);
   //  n_Delete(&C2,r);
-  n_Delete(&MinusOne,r);
 #ifdef PDEBUG
   p_Test(M2,r);
@@ -1749 +1762 @@
   {
     C1=n_Div(C1, C, r);                            // C1 = C1 / C
+    n_Normalize(C1,r);
     C2=n_Div(C2, C, r);                            // C2 = C2 / C
+    n_Normalize(C2,r);
   }
   else