Changeset 9ebfb1b in git

Timestamp:

May 24, 1998, 11:04:13 AM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

96b804631b095d8928ec2c241293ce9015190de7

Parents:

4450163d09cf95a4bb144b396250a639a524f7a6

Message:

* changed version to 1.2.0


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

Files:

• Singular/LIB/tst.lib (modified) (3 diffs)
• Singular/configure (modified) (1 diff)
• Singular/configure.in (modified) (1 diff)
• configure (modified) (1 diff)
• configure.in (modified) (1 diff)

Singular/LIB/tst.lib

@@ -1 @@
-// $Id: tst.lib,v 1.6 1998-05-15 16:18:19 obachman Exp $
+// $Id: tst.lib,v 1.7 1998-05-24 09:04:13 obachman Exp $
 //(obachman, last modified 2/13/98)
-///////////////////////////////////////////////////////////////////////////////
-
-version="$Id: tst.lib,v 1.6 1998-05-15 16:18:19 obachman Exp $";
+/////////////////////////////////////////////////////////////////////////////
+
+version="$Id: tst.lib,v 1.7 1998-05-24 09:04:13 obachman Exp $";
 info="
 LIBRARY:  tst.lib      PROCEDURES FOR RUNNING AUTOMATIC TST TESTS
+
 
  tst_system(s)          returns string which is stdout of system(\"sh\", s)
@@ -12 +13 @@
  tst_init()             writes some identification data to stdout
                         with tst_ignore
+ tst_groebnerTest(ideal i)  
+                        tests groebner command 
+ tst_stdEqual(ideal i1, ideal i2) 
+                        test whether two std's are \"equal\"
 ";
 
-///////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 proc tst_system(string s)
@@ -149 +154 @@
 }
 
-
-
+///////////////////////////////////////////////////////////////////////
+
+proc tst_groebnerTest(ideal i, list #)
+"USAGE: tst_groebnerTesti,[v]) : ideal i, [int v]
+RETURN: 1, if groebner command produced \"equal\" std as std command
+        0, otherwise
+        Two std's are \"equal\" here, if their redSB's are element-wise equal,
+        and if they reduce each other to zero, and if their leading ideals 
+        are equal
+        On success, times of std - groebner is written with tst_ignore, and
+        times are added to global variables tst_std_time and 
+        tst_groebner_time. If v given, and <= 0, short ideal 
+        characteristic is print, if v > 0, ideals are printed.
+        On failure, Error message and ideals are printed.
+EXAMPLE: example tst_groebner; shows an example
+"
+{
+  int st = timer;
+  ideal si = std(i);
+  st = timer - st;
+  
+  int gt = timer;
+  ideal gi = groebner(i);
+  gt = timer - gt;
+
+  if (tst_stdEqual(si, gi))
+  {
+    tst_ignore(string(st) + " - " + string(gt) + " == " + string(st - gt));
+    if (! defined(tst_groebner_time))
+    {
+      int tst_groebner_time;
+      int tst_std_time;
+      export tst_groebner_time, tst_std_time;
+    }
+    tst_std_time = tst_std_time + st;
+    tst_groebner_time = tst_groebner_time + gt;
+    if (size(#))
+    {
+      if (typeof(#[1] == "int"))
+      {
+        if (#[1] <= 0)
+        {
+          idPrintShort(si, "si");
+          idPrintShort(gi, "gi");
+        }
+        else
+        {
+          si;
+          gi;
+        }
+      }
+    }
+    return (1);
+  }
+  return (0);
+}
+example
+{
+  "EXAMPLE: "; echo = 2;
+  ring r = 0, (a,b,c,d), lp;
+  ideal i = a+b+c+d, ab+ad+bc+cd, abc+abd+acd+bcd, abcd-1; // cyclic 4
+  tst_groebnerTest(i);
+  tst_groebnerTest(i, 0);
+  tst_groebnerTest(i, 1);
+}
+
+  
+//
+// A routine which test for equality of "std-bases"
+// 
+proc tst_stdEqual(ideal i1, ideal i2)
+"USAGE: tst_stdEqual(i1, i2)  ideal i1, i2
+RETURN 1, if i1 \"equald\" i2 as a std bases
+       0, otherwise
+       Two std's are \"equal\" here, if their redSB's are element-wise equal,
+       and if they reduce each other to zero, and if their leading ideals 
+       are equal
+       On failure, error message is printed.
+EXAMPLE: example tst_stdEqual; shows an example
+"
+{
+  int i;
+  int back;
+  intvec opts = option(get);
+  option(redSB);
+  
+  ideal ri1 = simplify(interred(i1), 1);
+  ideal ri2 = simplify(interred(i2), 1);
+  
+  option(set, opts);
+
+  if (size(ri1) != size(ri2))
+  {
+    "Error in tst_stdEqual: Reduced sizes differ";
+    size(ri1);
+    size(ri2);
+    return(0);
+  }
+
+  for (i=1; i<=size(ri1); i++)
+  {
+    if (ri1[i] != ri2[i])
+    {
+      "Error in tst_stdEqual: " + string(i) + " th poly differ";
+      ri1[i];
+      ri2[i];
+      return(0);
+    }
+  }
+
+  // reduced SB are now equal
+  if (size(reduce(i1, i2, 1)) == 0)
+  {
+    if (size(reduce(i2, i1, 1)) == 0)
+    {
+      poly p1, p2;
+      
+      ideal si1 = simplify(i1, 7);
+      ideal si2 = simplify(i2, 7);
+      
+      if (size(si1) == size(si2))
+      {
+        for (i=1; i<=size(si1); i++)
+        {
+          p1 = p1 + lead(si1[i]);
+          p2 = p2 + lead(si2[i]);
+        }
+        if (p1 != p2)
+        {
+          "Error in tst_stdEqual: Lead monoms differ:";
+          p1;
+          p2;
+          return(0);
+        }
+      }
+      else
+      {
+        "Error in tst_stdEqual: size differs:";
+        size(si1);
+        size(si2);
+        return(0);
+      }
+    }
+    else
+    {
+      "Error in tst_stdEqual: reduce(i2, i1) != 0";
+      return(0);
+    }
+  }
+  else
+  {
+    back = 1; "Error in tst_stdEqual: reduce(i1, i2) != 0";
+    return(0);
+  }
+
+  return (1);
+}
+example
+{
+  "EXAMPLE: "; echo = 2;
+  ring r = 0, (a,b,c,d), lp;
+  ideal i = a+b+c+d, ab+ad+bc+cd, abc+abd+acd+bcd, abcd-1; // cyclic 4
+  tst_stdEqual(groebner(i), std(i));
+  tst_stdEqual(std(i), i);
+}
+
+static proc idPrintShort(ideal id, string name)
+{
+  "Summary of " + name + " (leading monoms and size of polys):";
+  int i;
+  for (i = 1; i<=size(id); i++)
+  {
+    "[" + string(i) + "]: #" + string(size(id[i])) + ":" + string(lead(id[i]));
+  }
+}
+
+  
+
+

Singular/configure

@@ -545 +545 @@
 
 SINGULAR_MAJOR_VERSION=1
-SINGULAR_MINOR_VERSION=1
-SINGULAR_SUB_VERSION=8
-VERSION_DATE="April 1998"
+SINGULAR_MINOR_VERSION=2
+SINGULAR_SUB_VERSION=0
+VERSION_DATE="May 1998"
 
 

Singular/configure.in

@@ -7 +7 @@
 dnl
 SINGULAR_MAJOR_VERSION=1
-SINGULAR_MINOR_VERSION=1
-SINGULAR_SUB_VERSION=8
-VERSION_DATE="April 1998"
+SINGULAR_MINOR_VERSION=2
+SINGULAR_SUB_VERSION=0
+VERSION_DATE="May 1998"
 AC_SUBST(SINGULAR_MAJOR_VERSION)
 AC_SUBST(SINGULAR_MINOR_VERSION)

configure

@@ -560 +560 @@
 
 SINGULAR_MAJOR_VERSION=1
-SINGULAR_MINOR_VERSION=1
-SINGULAR_SUB_VERSION=8
-VERSION_DATE="April 1998"
+SINGULAR_MINOR_VERSION=2
+SINGULAR_SUB_VERSION=0
+VERSION_DATE="May 1998"
 
 

configure.in

@@ -7 +7 @@
 dnl
 SINGULAR_MAJOR_VERSION=1
-SINGULAR_MINOR_VERSION=1
-SINGULAR_SUB_VERSION=8
-VERSION_DATE="April 1998"
+SINGULAR_MINOR_VERSION=2
+SINGULAR_SUB_VERSION=0
+VERSION_DATE="May 1998"
 AC_SUBST(SINGULAR_MAJOR_VERSION)
 AC_SUBST(SINGULAR_MINOR_VERSION)