Changeset dd2aa36 in git

Timestamp:

Jun 21, 1999, 7:34:15 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

1354bda55ee798716af916942e769a15d6728278

Parents:

d1f46162556b5ef35ebcf98cea94b1706df61795

Message:

* hannes: fixed verbosity of general.lib::kmemory


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

File:

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

Singular/LIB/general.lib

@@ -1 @@
-// $Id: general.lib,v 1.12 1999-06-18 13:47:27 greuel Exp $
+// $Id: general.lib,v 1.13 1999-06-21 17:34:15 Singular Exp $
 //system("random",787422842);
 //GMG, last modified 18.6.99
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: general.lib,v 1.12 1999-06-18 13:47:27 greuel Exp $";
+version="$Id: general.lib,v 1.13 1999-06-21 17:34:15 Singular Exp $";
 info="
 LIBRARY:  general.lib   PROCEDURES OF GENERAL TYPE
@@ -13 +13 @@
  factorial(n[,../..]);  n factorial (=n!) (type int), [type string/number]
  fibonacci(n[,p]);      nth Fibonacci number [char p]
- kmemory([n]);          active [allocated] memory in kilobyte
+ kmemory([n[,v]]);      active [allocated] memory in kilobyte
  killall();             kill all user-defined variables
  number_e(n);           compute exp(1) up to n decimal digits
@@ -231 +231 @@
 
 proc kmemory (list #)
-"USAGE:   kmemory([n]); n = int
+"USAGE:   kmemory([n,[v]]); n = int
 RETURN:  memory in kilobyte of type int
          n=0: memory used by active variables (same as no parameters)
@@ -237 +237 @@
          n=2: difference between top and init memory adress (sbrk memory)
          n!=0,1,2: 0
-DISPLAY: detailed information about allocated and used memory if n!=0,1,2
+DISPLAY: detailed information about allocated and used memory if v!=0
 NOTE:    kmemory uses internal function 'memory' to compute kilobyte, and
          is the same as 'memory' for n!=0,1,2
@@ -244 +244 @@
 { 
    int n;
+   int verb;
    if (size(#) != 0)
    {
      n=#[1];
+     if (size(#) >1)
+     { verb=#[2]; }
    }
    
-  if ( n==0)
-  { dbprint(printlevel-voice+3,
-    "// memory used, at the moment, by active variables (kilobyte):"); }
-  if ( n==1 )
-  { dbprint(printlevel-voice+3,
-    "// total memory allocated, at the moment, by SINGULAR (kilobyte):"); }
+  if ( verb != 0)
+  {
+    if ( n==0)
+    { dbprint(printlevel-voice+3,
+      "// memory used, at the moment, by active variables (kilobyte):"); }
+    if ( n==1 )
+    { dbprint(printlevel-voice+3,
+      "// total memory allocated, at the moment, by SINGULAR (kilobyte):"); }
+   }
    return ((memory(n)+1023)/1024);
 }
@@ -260 +266 @@
 { "EXAMPLE:"; echo = 2;
    kmemory();
-   kmemory(1);
+   kmemory(1,1);
 }
 ///////////////////////////////////////////////////////////////////////////////