Changeset f30fdc in git

Timestamp:

Oct 10, 2008, 2:59:23 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

36e34686a0b133e6f1ebe6746a9e6ece43a48cf7

Parents:

280403a149a82e02268142c8f416c7edebb4da92

Message:

*hannes: IsPrime(MININT)


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

Location:

Singular

Files:

• ipshell.cc (modified) (5 diffs)
• singular-libs (modified) (1 diff)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.194 2008-10-10 10:18:13 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.195 2008-10-10 12:59:22 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -570 +570 @@
 }
 
-int IsPrime(int p)  /* brute force !!!! */
-{
-  int i,j;
-  if      (p == 0)    return 0;
-  else if (p == 1)    return 1/*1*/;
-  else if (p == 2)    return p;
-  else if (p < 0)     return (-IsPrime(-p));
-  else if (!(p & 1)) return IsPrime(p-1);
+int iiIsPrime0(unsigned p)  /* brute force !!!! */
+{
+  unsigned i,j;
 #ifdef HAVE_FACTORY
-  else if (p<=32749) // max. small prime in factory
+  if (p<=32749) // max. small prime in factory
   {
     int a=0;
@@ -596 +591 @@
 #endif
 #ifdef HAVE_FACTORY
-  int end_i=cf_getNumSmallPrimes()-1;
+  unsigned end_i=cf_getNumSmallPrimes()-1;
 #else
-  int end_i=p/2;
+  unsigned end_i=p/2;
 #endif
-  int end_p=(int)sqrt((double)p);
+  unsigned end_p=(unsigned)sqrt((double)p);
 restart:
   for (i=0; i<end_i; i++)
@@ -613 +608 @@
     {
     #ifdef HAVE_FACTORY
-      if (p<=32751) return IsPrime(p-2);
+      if (p<=32751) return iiIsPrime0(p-2);
     #endif
       p-=2;
@@ -621 +616 @@
   }
   return p;
+}
+int IsPrime(int p)  /* brute force !!!! */
+{
+  int i,j;
+  if      (p == 0)    return 0;
+  else if (p == 1)    return 1/*1*/;
+  else if ((p == 2)||(p==3))    return p;
+  else if (p < 0)     return (iiIsPrime0((unsigned)(-p)));
+  else if ((p & 1)==0) return iiIsPrime0((unsigned)(p-1));
+  return iiIsPrime0((unsigned)(p));
 }
 

Singular/singular-libs

@@ -11 +11 @@
         finvar.lib   gmspoly.lib   gmssing.lib   general.lib   graphics.lib \
         grwalk.lib   groups.lib    hnoether.lib  homolog.lib   hyperel.lib \
-        inout.lib    intprog.lib   jacobbson.lib kskernel.lib  latex.lib \
+        inout.lib    intprog.lib   jacobson.lib kskernel.lib  latex.lib \
         linalg.lib   lll.lib       makedbm.lib   matrix.lib \
         modstd.lib   mondromy.lib  mprimdec.lib  mregular.lib  rootsmr.lib \