Changeset ed7cb5 in git

Timestamp:

Aug 24, 2001, 3:41:35 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

47c8f1203dc6663433e108e9e01f128d3ca726e3

Parents:

f299facd1825ad4aaf3bc53207a5cfcb6892f886

Message:

*hannes: int(z/n) return trunc(z/n) instead of 0 for z/n not in Z


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

File:

• Singular/longrat.cc (modified) (24 diffs)

Singular/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.38 2001-03-22 19:11:06 Singular Exp $ */
+/* $Id: longrat.cc,v 1.39 2001-08-24 13:41:35 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -102 +102 @@
 
 /***************************************************************
- *  
+ *
  * Routines which are never inlined by p_Numbers.h
  *
@@ -109 +109 @@
 
 omBin rnumber_bin = omGetSpecBin(sizeof(rnumber));
+
+number nlOne=nlInit(1);
 
 static int nlPrimeM;
@@ -487 +489 @@
   if (SR_HDL(i) &SR_INT) return SR_TO_INT(i);
   nlGmpSimple(&i->z);
-  if ((i->s!=3)||(mpz_size1(&i->z)>MP_SMALL)) return 0;
-  int ul=(int)mpz_get_si(&i->z);
-  if (mpz_cmp_si(&i->z,(long)ul)!=0) return 0;
+  if (i->s==3)
+  {
+    if(mpz_size1(&i->z)>MP_SMALL) return 0;
+    int ul=(int)mpz_get_si(&i->z);
+    if (mpz_cmp_si(&i->z,(long)ul)!=0) return 0;
+    return ul;
+  }
+  lint tmp;
+  int ul;
+  mpz_init(&tmp);
+  MPZ_DIV(&tmp,&i->z,&i->n);
+  if(mpz_size1(&tmp)>MP_SMALL) ul=0;
+  else
+  {
+    ul=(int)mpz_get_si(&tmp);
+    if (mpz_cmp_si(&tmp,(long)ul)!=0) ul=0;
+  }
+  mpz_clear(&tmp);
   return ul;
 }
@@ -516 +533 @@
     }
     n=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
     n->debug=123456;
 #endif
@@ -539 +556 @@
   }
   n=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   n->debug=123456;
 #endif
@@ -624 +641 @@
   }
   u=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   u->debug=123456;
 #endif
@@ -720 +737 @@
   }
   u=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   u->debug=123456;
 #endif
@@ -838 +855 @@
   }
   u=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   u->debug=123456;
 #endif
@@ -887 +904 @@
   u=(number)omAllocBin(rnumber_bin);
   u->s=0;
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   u->debug=123456;
 #endif
@@ -1039 +1056 @@
     }
     *u=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
     (*u)->debug=123456;
 #endif
@@ -1176 +1193 @@
   }
   result=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   result->debug=123456;
 #endif
@@ -1268 +1285 @@
         {
           mpz_clear(&x->z);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
           x->debug=654324;
 #endif
@@ -1312 +1329 @@
   }
   result=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   result->debug=123456;
 #endif
@@ -1388 +1405 @@
         number u=(number)omAllocBin(rnumber_bin);
         u->s=3;
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
         u->debug=123456;
 #endif
@@ -1411 +1428 @@
 
 /***************************************************************
- *  
+ *
  * routines which are needed by Inline(d) routines
  *
@@ -1483 +1500 @@
 #endif
   number b=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   b->debug=123456;
 #endif
@@ -1543 +1560 @@
 {
   number u=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   u->debug=123456;
 #endif
@@ -1755 +1772 @@
 {
   number u=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   u->debug=123456;
 #endif
@@ -2034 +2051 @@
 {
   number u=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   u->debug=123456;
 #endif
@@ -2054 +2071 @@
 }
 
-// a or b are not immediate 
+// a or b are not immediate
 number _nlMult_aNoImm_OR_bNoImm(number a, number b)
 {
   assume(! (SR_HDL(a) & SR_HDL(b) & SR_INT));
   number u=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   u->debug=123456;
 #endif
@@ -2176 +2193 @@
 {
   number z=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
   z->debug=123456;
 #endif
   mpz_init_set_si(&z->z,(long)i);
   z->s = 3;
+  return z;
+}
+
+/*2
+* z := i/j
+*/
+number nlInit2 (int i, int j)
+{
+  number z=(number)omAllocBin(rnumber_bin);
+#if defined(LDEBUG)
+  z->debug=123456;
+#endif
+  mpz_init_set_si(&z->z,(long)i);
+  mpz_init_set_si(&z->n,(long)j);
+  z->s = 0;
+  nlNormalize(z);
   return z;
 }
@@ -2201 +2234 @@
 
 /***************************************************************
- *  
+ *
  * Routines which might be inlined by p_Numbers.h
  *
@@ -2258 +2291 @@
 */
 LINLINE number nlCopy(number a)
-{
-  if ((SR_HDL(a) & SR_INT)||(a==NULL))
-  {
-    return a;
-  }
-  return _nlCopy_NoImm(a);
-}
-
-LINLINE number nl_Copy(number a, ring r)
 {
   if ((SR_HDL(a) & SR_INT)||(a==NULL))