Changeset 2f436b in git for Singular/LIB/general.lib

Timestamp:

Dec 31, 2000, 4:14:47 PM (22 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

e609098c45a74ac91c002ffa7ece5eebe7f8c002

Parents:

33ec1145a109507ad3e3cf4a69a847b703358e93

Message:

* version 1-3-13: sparsemat improivements


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

File:

• Singular/LIB/general.lib (modified) (6 diffs)

Singular/LIB/general.lib

@@ -2 +2 @@
 //anne, added deleteSublist and watchdog 12.12.2000
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: general.lib,v 1.33 2000-12-30 03:00:57 greuel Exp $";
+version="$Id: general.lib,v 1.34 2000-12-31 15:14:46 obachman Exp $";
 category="General purpose";
 info="
@@ -271 +271 @@
 EXAMPLE:  example factorial; shows an example
 "
-{   int str,l,p;
+{   int l,p;
 //---------------------------- initialization -------------------------------
    if ( size(#) == 0 )
-   {  str = 1;
+   {  
       ring bin = 0,x,dp;
       number r=1;
@@ -284 +284 @@
       {
          if ( p == char(basering) )
-         {  number r=1;
+         {
+           // do it clever !
+           if (n < 1) {return (0);}
+           if (! defined(sv_factorials))
+           {
+             ideal sv_factorials;
+             sv_factorials[1] = 1;
+             export(sv_factorials);
+           }
+           if (n > size(sv_factorials))
+           {
+             int i = size(sv_factorials);
+             sv_factorials[n] = 0;
+             number fi = number(sv_factorials[i]);
+             for (i++;i<=n;i++)
+             {
+               fi = fi * i;
+               sv_factorials[i] = fi;
+             }
+             return (fi);
+           }
+           else
+           {
+             return (number(sv_factorials[n]));
+           }
          }
          else
-         {  str = 1;
+         {  
             ring bin = p,x,dp;
             number r=1;
@@ -293 +317 @@
       }
       else
-      {  str = 1;
+      {  
          ring bin = p,x,dp;
          number r=1;
@@ -303 +327 @@
       r=r*l;
    }
-   if ( str==1 ) { return(string(r)); }
-   else { return(r); }
+   return(string(r));
 }
 example
@@ -313 +336 @@
    p;
 }
+    
+        
 ///////////////////////////////////////////////////////////////////////////////