Changeset 2eeb7d in git

Timestamp:

Jul 13, 1999, 6:24:45 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

eff050869a8899bcdec83ae6d17706325400e93d

Parents:

e202148165f594419822417d29c7ed3dac92e205

Message:

*hannes: minor optimizations


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

Location:

Singular

Files:

• iparith.cc (modified) (4 diffs)
• ipshell.cc (modified) (4 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.160 1999-07-12 18:24:57 Singular Exp $ */
+/* $Id: iparith.cc,v 1.161 1999-07-13 16:24:45 Singular Exp $ */
 
 /*
@@ -5779 +5779 @@
         break;
       }
-      else if (strcmp(n, cmds[en].name) == 0)
+      else if ((an!=en) && (strcmp(n, cmds[en].name) == 0))
       {
         i=en;
@@ -5792 +5792 @@
     if (*n < *(cmds[i].name))
     {
-      en=i;
+      en=i-1;
     }
     else if (*n > *(cmds[i].name))
     {
-      an=i;
+      an=i+1;
     }
     else
@@ -5803 +5803 @@
       if(v<0)
       {
-        en=i;
+        en=i-1;
       }
       else if(v>0)
       {
-        an=i;
+        an=i+1;
       }
       else /*v==0*/

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.43 1999-07-05 13:52:06 obachman Exp $ */
+/* $Id: ipshell.cc,v 1.44 1999-07-13 16:24:44 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -33 +33 @@
 #include "stairc.h"
 #include "ipshell.h"
+#ifdef HAVE_FACTORY
+#define SI_DONT_HAVE_GLOBAL_VARS
+#include <factory.h>
+#endif
 
 leftv iiCurrArgs=NULL;
@@ -521 +525 @@
   else if (p <  0) return (-IsPrime(-p));
   else if (!(p & 1)) return IsPrime(p-1);
+#ifdef HAVE_FACTORY
+  int a=0;
+  int e=cf_getNumSmallPrimes();
+  i=e/2;
+  do
+  {
+    if (p==(j=cf_getSmallPrime(i))) return p;
+    if (p<j) e=i-1;
+    else     a=i+1;
+    i=a+(e-a)/2;
+  } while ( a<= e);
+  if (p>j) return j;
+  else     return cf_getSmallPrime(i-1);
+#else  
   for (j=p/2+1,i=3; i<p; i+=2)
   {
@@ -527 +545 @@
   }
   return p;
+#endif
 }