Changeset cb13f0 in git

Timestamp:

Jun 30, 1998, 4:48:21 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b240fff7d1e54539abddf713f54ac34ffa1ec1fa

Parents:

e960fdfc67b70f59abfe61acd935550f509a386c

Message:

* bug fix


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

Location:

Singular

Files:

• LIB/tst.lib (modified) (9 diffs)
• syz1.cc (modified) (2 diffs)

Singular/LIB/tst.lib

@@ -1 @@
-// $Id: tst.lib,v 1.8 1998-06-12 17:41:42 obachman Exp $
-//(obachman, last modified 2/13/98)
+// $Id: tst.lib,v 1.9 1998-06-30 14:48:21 obachman Exp $
+//(obachman, last modified 6/30/98)
 /////////////////////////////////////////////////////////////////////////////
 
-version="$Id: tst.lib,v 1.8 1998-06-12 17:41:42 obachman Exp $";
+version="$Id: tst.lib,v 1.9 1998-06-30 14:48:21 obachman Exp $";
 info="
 LIBRARY:  tst.lib      PROCEDURES FOR RUNNING AUTOMATIC TST TESTS
@@ -13 +13 @@
  tst_init()             writes some identification data to stdout
                         with tst_ignore
+ tst_status([any])      writes status info to stdout with tst_ignore()
  tst_groebnerTest(ideal i)  
                         tests groebner command 
@@ -32 +33 @@
   errno = system("sh", s);
   s = read(tmpfile);
-  errno = system("sh", "rm " + tmpfile);
+  errno = system("sh", "rm -f " + tmpfile);
   return (s);
 }
@@ -46 +47 @@
 "USAGE:    tst_ignore(any,[keyword], [link])
             any     -- valid argument to string()
-            keyword -- one of \"time\" or \"memory\"
+            keyword -- an arbitrary string 
             link    -- a link which can be written to
 RETURN:   none; writes string(any) to link (or stdout, if no link given),
-          prepending prefix \"// ignore:\", or \"// ignore: time:\",
-          \"//ignore: memory:\"  if called with the respective keywords;
-          should be used in tst files to output system dependent data
-          (like date, pathnames) { and timings With the keyword \"time\",
-          resp. memory usage with the keyword \"memory\"
+          prepending prefix \"// ignore:\", or 
+                            \"// ignore:keyword hostname:\",
+                            if keyword was given.
+          Should be used in tst files to output system dependent data
+          (like date, pathnames).
 EXAMPLE:  example tst_ignore; shows examples
 "
@@ -95 +96 @@
     return();
   }
-  if (keyword == "time" || keyword == "memory")
-  {
-    keyword = keyword + ": ";
-  }
-  else
-  {
-    if (keyword != "")
-    {
-      "Warning tst_ignore: keyword should be \"time\" or \"memory\"";
-    }
-  }
 
   if (status(outlink, "open", "no"))
@@ -111 +101 @@
     open(outlink);
   }
+
   if (status(outlink, "write", "not ready"))
   {
@@ -120 +111 @@
 
   // ready -- do the actual work
-  write(outlink, "// ignore: " + keyword + s);
+  if (keyword != "")
+  {
+    if (! defined(tst_hostname))
+    {
+      string tst_hostname = tst_system("hostname");
+      tst_hostname = tst_hostname[1..size(tst_hostname)-1];
+      export tst_hostname;
+    }
+
+    write(outlink, "// ignore:" + keyword + " " + tst_hostname + ":" + s);
+  }
+  else
+  {
+    write(outlink, "// ignore: " + s);
+  }
 }
 example
@@ -135 +140 @@
 }
 
+proc tst_status (list #)
+"USAGE:   tst_status([any])
+RETURN:   none; writes to stdout the current memory usage and used time
+          since last call to tst_status(), if no argument is given, or, 
+          since start-up of Singular, if an argument is given.
+NOTE:     Should be used regularly within tst files to enable automatic 
+          tracking of memory and time performance.
+EXAMPLE: example tst_status; shows example
+"
+{
+  tst_ignore(memory(0), "tst_memory_0");
+  tst_ignore(memory(1), "tst_memory_1");
+  tst_ignore(memory(2), "tst_memory_2");
+  if (size(#) > 0)
+  {
+    tst_ignore(timer, "tst_timer_1");
+  }
+  else
+  {
+    if (! defined(tst_timer))
+    {
+      int tst_timer = 0;
+      export tst_timer;
+    }
+    tst_ignore(timer - tst_timer, "tst_timer");
+    tst_timer = timer;
+  }
+}
+example
+{
+  "EXAMPLE";  echo = 2;
+  tst_status();
+  ring r;
+  poly p = (x+y+z)^40;
+  tst_status();
+  tst_status(1);
+}
+
+  
 proc tst_init
 "USAGE:   tst_init()
@@ -142 +186 @@
 "
 {
+  if (! defined(tst_hostname))
+  {
+    string tst_hostname = tst_system("hostname");
+    tst_hostname = tst_hostname[1..size(tst_hostname)-1];
+    export tst_hostname;
+  }
   tst_ignore("USER    : " + system("getenv", "USER"));
-  tst_ignore("HOSTNAME: " + system("getenv", "HOST"));
+  tst_ignore("HOSTNAME: " + tst_hostname);
   tst_ignore("uname -a: " + tst_system("uname -a"));
   tst_ignore("date    : " + tst_system("date"));
   tst_ignore("version : " + string(system("version")));
+  tst_ignore("ticks   : " + system("--ticks-per-sec"));
+  if (! defined(tst_timer))
+  {
+    int tst_timer;
+    export tst_timer;
+  }
+  
+  tst_status();
 }
 example

Singular/syz1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz1.cc,v 1.29 1998-06-29 13:16:37 pohl Exp $ */
+/* $Id: syz1.cc,v 1.30 1998-06-30 14:48:20 obachman Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -504 +504 @@
   else
   {
-    poly p,result=p=pNew();
+    poly p,result=p=pInit();
     number n;
     loop