Changeset 728478 in git

Timestamp:

Jul 14, 1998, 2:46:26 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

371ea55fb2c0f4d718284e7a3cfd14c3973c8bed

Parents:

a23d8e9162ac8e732ebaa9d0df122d9e7f6f64dd

Message:

* minor bug fixes


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

Location:

Tst/Short

Files:

• barei_s.tst (modified) (1 diff)
• fetch_s.tst (modified) (1 diff)
• liftstd_s.tst (modified) (2 diffs)
• minor_s.tst (modified) (1 diff)
• mpsr_s.tst (modified) (1 diff)
• polylib_s.tst (modified) (1 diff)

Tst/Short/barei_s.tst

@@ -2 +2 @@
 // test script for bareiss command
 //
+LIB "tst.lib";
+tst_init();
+
 pagelength = 10000;
 ring r = 32003,(x,y,z),dp;

Tst/Short/fetch_s.tst

@@ +1 @@
+LIB "tst.lib";
+tst_init();
+
 proc generate_ring_str(int n, string r_name, string ostring)
 {

Tst/Short/liftstd_s.tst

@@ -7 +7 @@
 ring r1 = 32003,(x,y,z),(c,ls);
 r1;
-LIB "lib0";
+
+proc pmat (matrix m,list #)
+{
+  if ( size(#) == 0)
+  {
+//------------- main case: input is a matrix, no second argument---------------
+    int @elems;
+    int @mlen;
+    int @slen;
+    int @c;
+    int @r;
+//-------------- count maximal size of each column, and sum up ----------------
+
+    for ( @c=1; @c<=ncols(m); @c=@c+1)
+    {  int @len(@c);
+      for (@r=1; @r<=nrows(m); @r=@r+1)
+      {
+        @elems = @elems + 1;
+        string @s(@elems) = string(m[@r,@c])+",";
+        @slen = size(@s(@elems));
+        if (@slen > @len(@c))
+        {
+          @len(@c) = @slen;
+        }
+      }
+      @mlen = @mlen + @len(@c);
+    }
+//---------------------- print all - except last - rows -----------------------
+
+    string @aus;
+    string @sep = " ";
+    if (@mlen >= pagewidth)
+    {
+      @sep = newline;
+    }
+
+    for (@r=1; @r<nrows(m); @r=@r+1)
+    {
+      @elems = @r;
+      @aus = "";
+      for (@c=1; @c<=ncols(m); @c=@c+1)
+      {
+        @aus = @aus + @s(@elems)[1,@len(@c)] + @sep;
+        @elems = @elems + nrows(m);
+      }
+      @aus;
+    }
+//--------------- print last row (no comma after last entry) ------------------
+
+    @aus = "";
+    @elems = nrows(m);
+    for (@c=1; @c<ncols(m); @c=@c+1)
+    {
+      @aus = @aus + @s(@elems)[1,@len(@c)] + @sep;
+      @elems = @elems + nrows(m);
+    }
+    @aus = @aus + string(m[nrows(m),ncols(m)]);
+    @aus;
+    return();
+  }
+//--------- second case: input is a matrix, second argument is given ----------
+
+  if ( size(#) == 1 )
+  {
+    if ( typeof(#[1]) == "int" )
+    {
+      string @aus;
+      string @tmp;
+      int @ll;
+      int @c;
+      int @r;
+      for ( @r=1; @r<=nrows(m); @r=@r+1)
+      {
+        @aus = "";
+        for (@c=1; @c<=ncols(m); @c=@c+1)
+        {
+          @tmp = string(m[@r,@c]);
+          @aus = @aus + @tmp[1,#[1]] + " ";
+        }
+        @aus;
+      }
+    }
+  }
+}
+
 "-------------------------------";
 ideal i1=maxideal(3);
@@ -13 +97 @@
 i2;
 matrix m1[3][3]=x,y,z,xz,yx,12zx,0,y2,3xy2;
+~;
 pmat(m1);
 liftstd(i2,m1);

Tst/Short/minor_s.tst

@@ -7 +7 @@
 ring r1 = 32003,(x,y,z),(c,dp);
 r1;
-LIB "lib0";
+
+proc pmat (matrix m,list #)
+{
+  if ( size(#) == 0)
+  {
+//------------- main case: input is a matrix, no second argument---------------
+    int @elems;
+    int @mlen;
+    int @slen;
+    int @c;
+    int @r;
+//-------------- count maximal size of each column, and sum up ----------------
+
+    for ( @c=1; @c<=ncols(m); @c=@c+1)
+    {  int @len(@c);
+      for (@r=1; @r<=nrows(m); @r=@r+1)
+      {
+        @elems = @elems + 1;
+        string @s(@elems) = string(m[@r,@c])+",";
+        @slen = size(@s(@elems));
+        if (@slen > @len(@c))
+        {
+          @len(@c) = @slen;
+        }
+      }
+      @mlen = @mlen + @len(@c);
+    }
+//---------------------- print all - except last - rows -----------------------
+
+    string @aus;
+    string @sep = " ";
+    if (@mlen >= pagewidth)
+    {
+      @sep = newline;
+    }
+
+    for (@r=1; @r<nrows(m); @r=@r+1)
+    {
+      @elems = @r;
+      @aus = "";
+      for (@c=1; @c<=ncols(m); @c=@c+1)
+      {
+        @aus = @aus + @s(@elems)[1,@len(@c)] + @sep;
+        @elems = @elems + nrows(m);
+      }
+      @aus;
+    }
+//--------------- print last row (no comma after last entry) ------------------
+
+    @aus = "";
+    @elems = nrows(m);
+    for (@c=1; @c<ncols(m); @c=@c+1)
+    {
+      @aus = @aus + @s(@elems)[1,@len(@c)] + @sep;
+      @elems = @elems + nrows(m);
+    }
+    @aus = @aus + string(m[nrows(m),ncols(m)]);
+    @aus;
+    return();
+  }
+//--------- second case: input is a matrix, second argument is given ----------
+
+  if ( size(#) == 1 )
+  {
+    if ( typeof(#[1]) == "int" )
+    {
+      string @aus;
+      string @tmp;
+      int @ll;
+      int @c;
+      int @r;
+      for ( @r=1; @r<=nrows(m); @r=@r+1)
+      {
+        @aus = "";
+        for (@c=1; @c<=ncols(m); @c=@c+1)
+        {
+          @tmp = string(m[@r,@c]);
+          @aus = @aus + @tmp[1,#[1]] + " ";
+        }
+        @aus;
+      }
+    }
+  }
+}
+
 "-------------------------------";
 matrix m1[3][3]=maxideal(2);

Tst/Short/mpsr_s.tst

@@ -175 +175 @@
 killall("proc");
 dump("");
-tst_status(1);$
+LIB "tst.lib"; tst_status(1);$
 
 

Tst/Short/polylib_s.tst

@@ -7 +7 @@
 killall();
 
-exampe katsura();
+example katsura;
 killall();