Changeset 4e35a89 in git

Timestamp:

Jun 20, 2011, 5:58:01 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

9fd0b119fa3ca9c1ca135301b8c5a906abc2d2a4

Parents:

fe2d4cb34f289f4b0611d2b5ac416c7bc1b2c60a

Message:

nlInpMult used in p_Mult_nn

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

Location:

kernel

Files:

• longrat.cc (modified) (2 diffs)
• longrat.h (modified) (1 diff)
• p_Mult_nn__T.cc (modified) (1 diff)

kernel/longrat.cc

@@ -2281 +2281 @@
 }
 
+LINLINE void nlInpMult(number &a, number b, const ring r)
+{
+  if (((SR_HDL(b)|SR_HDL(a))&SR_INT))
+  {
+    number n=nlMult(a,b);
+    nlDelete(&a,r);
+    a=n;
+  }
+  else
+  {
+    mpz_mul(a->z,a->z,b->z);
+    if (a->s==3)
+    {
+      if(b->s!=3)
+      {
+        mpz_init_set(a->n,b->n);
+        a->s=0;
+      }
+    }
+    else
+    {
+      if(b->s!=3)
+      {
+        mpz_mul(a->n,a->n,b->n);
+      }
+      a->s=0;
+    }
+  }
+}
 #endif // DO_LINLINE
 
@@ -2335 +2364 @@
     MPZ_DIV(a->z,a->z,b->z);
     a=nlShort3_noinline(a);
-  }
-}
-void nlInpMult(number &a, number b, const ring r)
-{
-  if (((SR_HDL(b)|SR_HDL(a))&SR_INT)
-  )
-  {
-    number n=nlMult(a,b);
-    nlDelete(&a,r);
-    a=n;
-  }
-  else
-  {
-    mpz_mul(a->z,a->z,b->z);
-    if (a->s==3)
-    {
-      if(b->s!=3)
-      {
-        mpz_init_set(a->n,b->n);
-        a->s=0;
-      }
-    }
-    else
-    {
-      if(b->s!=3)
-      {
-        mpz_mul(a->n,a->n,b->n);
-      }
-      a->s=0;
-    }
   }
 }

kernel/longrat.h

@@ -98 +98 @@
 void nlInpGcd(number &a, number b, const ring r);
 void nlInpIntDiv(number &a, number b, const ring r);
-void nlInpAdd_(number &a, number b, const ring r);
 LINLINE number   nlInpAdd(number la, number li, const ring r);
-void nlInpMult(number &a, number b, ring r);
+LINLINE void nlInpMult(number &a, number b, ring r);
 
 number nlFarey(number nP, number nN);

kernel/p_Mult_nn__T.cc

@@ -29 +29 @@
   {
 #ifndef HAVE_ZERODIVISORS
-    number nc = pGetCoeff(p);
-    pSetCoeff0(p, n_Mult(n, nc, r));
-    n_Delete(&nc, r);
+    n_InpMult(pGetCoeff(p), n, r);
     pIter(p);
 #else