Changeset d7a7b6 in git

Timestamp:

Feb 23, 2009, 1:08:39 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

7924eecd41944b3878830cb230825ccae2e772ed

Parents:

182e83fadbf10f4510f28a284af732d6e1eeb25f

Message:

*hannes: .. in pmat, ticket 85


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

File:

• Singular/LIB/inout.lib (modified) (9 diffs)

Singular/LIB/inout.lib

@@ -1 @@
-//(GMG/BM, last modified 22.06.96)
-//(GMG, last modified 21.07.2008: Argument von show von id in @@id geaendert)
-///////////////////////////////////////////////////////////////////////////////
-version="$Id: inout.lib,v 1.31 2008-09-24 07:54:59 Singular Exp $";
+// (GMG/BM, last modified 22.06.96)
+///////////////////////////////////////////////////////////////////////////////
+version="$Id: inout.lib,v 1.32 2009-02-23 12:08:39 Singular Exp $";
 category="General purpose";
 info="
@@ -112 +111 @@
 proc pmat (matrix m, list #)
 "USAGE:   pmat(M[,n]);  M matrix, n integer
-DISPLAY: display M in array format if it fits into pagewidth; if n is given,
-         only the first n characters of each colum are shown
-RETURN:  no return value
+RETURN: A string representing M in array format if it fits into
+        pagewidth; if n is given, only the first n characters of
+        each column are shown (n>1 required), where a truncation
+        of a column is indicated by two dots (\'..\')
 EXAMPLE: example pmat; shows an example
 "
 {
 //------------- main case: input is a matrix, no second argument---------------
+   string OUT = "";
    if ( size(#)==0)
    {
@@ -144 +145 @@
             elems = elems + nrows(m);
          }
-         aus;
+         OUT=OUT+aus+newline;
       }
    //--------------- print last row (no comma after last entry) ---------------
@@ -154 +155 @@
       }
       aus = aus + string(m[nrows(m),ncols(m)]);
-      aus;  return();
+      OUT=OUT+aus;  return(OUT);
    }
 //---------- second case: second argument is given and of type int ------------
-   if ( typeof(#[1])=="int" )
-   {  string aus,tmp; int ll,c,r;
-      for ( r=1; r<=nrows(m); r=r+1)
+   if ( typeof(#[1])=="int" and #[1]>1)
+   {  string aus,tmp; int c,r;
+   //---------------------- print all - except last - rows --------------------
+      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;
-      }
-      return();
+            if (size(tmp)>#[1])
+            { tmp[#[1]-1]=".";
+              tmp[#[1]]  =".";
+              aus=aus+tmp[1,#[1]]+", ";
+            }
+            else
+            { tmp=tmp+",";
+              aus=aus+tmp[1,#[1]+1]+" ";
+            }
+         }
+         OUT=OUT+aus+newline;
+      }
+   //--------------- print last row (no comma after last entry) ---------------
+      aus = "";
+      for (c=1; c<ncols(m); c=c+1)
+      { tmp=string(m[r,c]);
+        if (size(tmp)>#[1])
+        { tmp[#[1]-1]=".";
+          tmp[#[1]]  =".";
+          aus=aus+tmp[1,#[1]]+", ";
+        }
+        else
+        { tmp=tmp+",";
+          aus=aus+tmp[1,#[1]+1]+" ";
+        }
+      }
+      tmp=string(m[nrows(m),ncols(m)]);
+      if (size(tmp)>#[1])
+      { tmp[#[1]-1]=".";
+        tmp[#[1]]  =".";
+      }
+      aus = aus + tmp[1,#[1]];
+      OUT=OUT+aus;  return(OUT);
    }
 }
@@ -177 +207 @@
    matrix m[3][3]=i^2;
    pmat(m);
-   pmat(m,3);
+   pmat(m,5);
 }
 ///////////////////////////////////////////////////////////////////////////////
@@ -348 +378 @@
       }
    }
-//----------------------- case: @@id is of type list -------------------------
+//----------------------- case: @@id is of type list ----------------------------
    if ( typeof(@@id)=="list" )
    {
@@ -457 +487 @@
       {
          list na@me@s=names(@id@);
-         //kill @id@;
+         kill @id@;
          @@s = tab(@li@)+"// ring:"; @@s,s;
          @@s = tab(@li@)+"// minpoly ="; @@s,minpoly;
@@ -535 +565 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-proc showrecursive (id,poly p,list #)
+proc showrecursive (@@id,poly p,list #)
 "USAGE:   showrecursive(id,p[,ord]); id= any object of basering, p= product of
          variables and ord=string (any allowed ordstr)
@@ -567 +597 @@
 
    execute("ring newP=("+newchar+"),("+newvar+"),("+neword+");");
-   def id = imap(P,id);
-   show(id);
+   def @@id = imap(P,@@id);
+   show(@@id);
    return();
 }