Changeset 8e4601 in git

Timestamp:

Oct 19, 2012, 8:16:52 PM (11 years ago)

Author:

Adrian <adi_popescum@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

b79ed5b79606bbec4a3bc2f9ad41e76c5d40137e

Parents:

3feb05488fc45f2659a728850a9c71ad9c0cb838

git-author:

Adrian <adi_popescum@yahoo.de>2012-10-19 20:16:52+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-10-22 11:18:07+02:00

Message:

64 bits for Spielwiese Last

Files:

• factory/cf_factor.cc (modified) (1 diff)
• factory/imm.h (modified) (3 diffs)
• libsingular-config.in (modified) (1 diff)

factory/cf_factor.cc

@@ -129 +129 @@
       if (CFFactory::gettype()==GaloisFieldDomain)
       {
-         int a= imm2int (f.getval());
+         long a= imm2int (f.getval());
          if ( a == gf_q )
-           printf ("+%d", a);
-         else  if ( a == 0 )
+           printf ("+%ld", a);
+         else  if ( a == 0L )
            printf ("+1");
-         else  if ( a == 1 )
+         else  if ( a == 1L )
            printf ("+%c",gf_name);
          else
          {
            printf ("+%c",gf_name);
-           printf ("^%d",a);
+           printf ("^%ld",a);
          }
       }

factory/imm.h

@@ -62 +62 @@
 inline InternalCF * int2imm ( long i )
 {
-    return (InternalCF*)(long)((i << 2) | INTMARK );
+    return (InternalCF*)((i << 2) | INTMARK );
 }
 
@@ -79 +79 @@
 {
     if ( i < 0 )
-        return (InternalCF*)(long)(-(((-i) << 2) | INTMARK));
-    else
-        return (InternalCF*)(long)((i << 2) | INTMARK );
+        return (InternalCF*)(-(((-i) << 2) | INTMARK));
+    else
+        return (InternalCF*)((i << 2) | INTMARK );
 }
 
@@ -88 +88 @@
 inline InternalCF * int2imm_p ( long i )
 {
-    return (InternalCF*)(long)((i << 2) | FFMARK );
+    return (InternalCF*)((i << 2) | FFMARK );
 }
 
 inline InternalCF * int2imm_gf ( long i )
 {
-    return (InternalCF*)(long)((i << 2) | GFMARK );
+    return (InternalCF*)((i << 2) | GFMARK );
 }
 //}}}

libsingular-config.in

@@ -76 +76 @@
 
     --libsg)
-        ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular_g -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g @FACTORY_LIBS@ -lomalloc_g -lfindexec_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@" 
+        ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular_g -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g @FACTORY_LIBSG@ -lomalloc_g -lfindexec_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@" 
         ;;