Changeset 5f4ae4 in git

Timestamp:

Mar 19, 2010, 5:08:52 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9a446f3ff706d80192fdd4fc1ba9113dce4eb47d

Parents:

520b582c51f3cae10134ddd12d0c4fe689a4e912

Message:

sca-std

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

Location:

kernel

Files:

• gring.cc (modified) (4 diffs)
• longrat.cc (modified) (1 diff)

kernel/gring.cc

@@ -1964 +1964 @@
   assume(pp!=NULL);
   pDelete(&m);
-  number n=nCopy(pGetCoeff(pp));
+  number n=pGetCoeff(pp);
   number nn;
   if (!n_IsMOne(n,currRing))
   {
     nn=nNeg(nInvers(n));
-  }
-  else nn=nInit(1);
-  nDelete(&n);
-  n=nMult(nn,pGetCoeff(kBucketGetLm(b)));
-  nDelete(&nn);
-  pp=p_Mult_nn(pp,n,currRing);
-  nDelete(&n);
+    n=nMult(nn,pGetCoeff(kBucketGetLm(b)));
+    nDelete(&nn);
+    pp=p_Mult_nn(pp,n,currRing);
+    nDelete(&n);
+  }
+  else
+  {
+    pp=p_Mult_nn(pp,pGetCoeff(kBucketGetLm(b)),currRing);
+  }
   int l=pLength(pp);
   kBucket_Add_q(b,pp,&l);
@@ -2130 +2132 @@
   // b will not by multiplied by any constant in this impl.
   // ==> *c=1
-  *c=nInit(1);
+  if (c!=NULL) *c=nInit(1);
   poly m=pOne();
   pExpVectorDiff(m,pHead(b),p);
@@ -2141 +2143 @@
 
   pDelete(&m);
-  number n=nCopy(pGetCoeff(pp));
-  number MinusOne=nInit(-1);
+  number n=pGetCoeff(pp);
   number nn;
-  if (!nEqual(n,MinusOne))
+  if (!nIsMOne(n))
   {
     nn=nNeg(nInvers(n));
-  }
-  else nn=nInit(1);
-  nDelete(&n);
-  n=nMult(nn,pGetCoeff(b));
-  nDelete(&nn);
-  pp=p_Mult_nn(pp,n,currRing);
-  nDelete(&n);
-  nDelete(&MinusOne);
+    n=nMult(nn,pGetCoeff(b));
+    nDelete(&nn);
+    pp=p_Mult_nn(pp,n,currRing);
+    nDelete(&n);
+  }
+  else
+  {
+    pp=p_Mult_nn(pp,pGetCoeff(b),currRing);
+  }
   b=p_Add_q(b,pp,currRing);
 }
@@ -2243 +2245 @@
   if (!n_IsMOne(n, currRing)) // TODO: as above.
   {
-    nn=nNeg(nInvers(nCopy(n)));
-  }
-  else nn=nInit(1);
-
-  number t = nMult(nn, pGetCoeff(b));
-  nDelete(&nn);
-
-  pp=p_Mult_nn(pp, t, currRing);
-  nDelete(&t);
+    nn=nNeg(nInvers(n));
+    number t = nMult(nn, pGetCoeff(b));
+    nDelete(&nn);
+    pp=p_Mult_nn(pp, t, currRing);
+    nDelete(&t);
+  }
+  else
+  {
+    pp=p_Mult_nn(pp, pGetCoeff(b), currRing);
+  }
+
 
   b=p_Add_q(b,pp,currRing);

kernel/longrat.cc

@@ -1095 +1095 @@
   nlTest(a);
 #endif
-  if (SR_HDL(a) & SR_INT) return (a==INT_TO_SR(-1));
-  return FALSE;
+  //if (SR_HDL(a) & SR_INT) return (a==INT_TO_SR(-1));
+  //return FALSE;
+  return  ((SR_HDL(a) & SR_INT) && (a==INT_TO_SR(-1)));
 }