Changeset 8710ff0 in git for libpolys

Timestamp:

Sep 29, 2012, 1:49:36 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

63e72b40a6237e50811b0e8745201177d25cb979

Parents:

d30a39922dc390f97b6cd257b2e7c55d483f4159

git-author:

Martin Lee <martinlee84@web.de>2012-09-29 13:49:36+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-10-19 11:05:30+02:00

Message:

chg: 64bit integers in factory by Adi Popescu

Location:

libpolys

Files:

• coeffs/longrat.cc (modified) (2 diffs)
• polys/clapconv.cc (modified) (1 diff)

libpolys/coeffs/longrat.cc

@@ -267 +267 @@
     {
       mpz_t dummy;
-      mpz_init_set( dummy,n->z );
-      term = make_cf( dummy );
+      long lz=mpz_get_si(n->z);
+      if (mpz_cmp_si(n->z,lz)==0) term=lz;
+      else
+      {
+        mpz_init_set( dummy,n->z );
+        term = make_cf( dummy );
+      }
     }
     else
@@ -287 +292 @@
   if (n.isImm())
   {
+    long lz=n.intval();
+    int iz=(int)lz;
+    if ((long)iz==lz)
+    {
+      return nlInit(n.intval(),r);
+    }
+    else  return nlRInit(lz);
     return nlInit(n.intval(),r);
   }

libpolys/polys/clapconv.cc

@@ -245 +245 @@
 {
   if ( f.isImm() )
-    return n_Init( f.intval(), r->cf->extRing->cf);
+  {
+    long longf=f.intval();
+    int intf=(int) longf;
+    if((long)intf==longf)
+    {
+      assume (r->cf->extRing != NULL);
+      return n_Init(f.intval(),r->cf->extRing->cf);
+    }
+    else return nlRInit( longf );
+  }
   else
   {