release: 1.0.1

[lilypond.git] / flower / matrix-debug.cc

diff --git a/flower/matrix-debug.cc b/flower/matrix-debug.cc
index 7126c1378ef9721b5f2cb72dbd6567cb663edf5f..d47d019367a36a833bb73e6df15e91cc05352fac 100644 (file)
--- a/flower/matrix-debug.cc
+++ b/flower/matrix-debug.cc
@@ -3,52 +3,55 @@
 
   source file of the Flower Library
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "flower-debug.hh"
 #include "matrix.hh"
-#include "matrix-storage.hh"
 
-
-Matrix::operator String() const
+String
+Matrix::str () const
 {
-    String s;
+  String s;
 #ifndef NPRINT
-    Matrix_storage const * stor_c_l = dat;
-    s=String ("matrix { (")  + dat->name() + ")\n";
-    for (int i=0; i< rows(); i++){
-       for (int j = 0; j < cols(); j++) {
-           s+= String (stor_c_l->elem (i,j), "%6f ");
+  Full_storage const * stor_c_l = dat_;
+  s = String ("matrix {");
+  for (int i=0; i< rows(); i++)
+    {
+      for (int j = 0; j < cols(); j++) 
+       {
+         s+= to_str (stor_c_l->elem (i,j), "%6f ");
        }
-       s+="\n";
+      s+="\n";
     }
-    s+="}\n";
+  s+="}\n";
 #endif
-    return s;
+  return s;
 }
 
 
 void
-Matrix::print() const
+Matrix::print () const
 {
 #ifndef NPRINT
-    fdebug << *this;
+  fdebug << *this;
 #endif
 }
 
-Vector::operator String() const
+String
+Vector::str () const
 {
-    String s;
+  String s;
 #ifndef NPRINT
-    s="vector [";
-    for (int i=0; i < dim(); i++) {
-       s += String (dat[i], "%6f") + String (' ');
+  s = String ("vector (") + to_str (dim ()) + ") [";
+  for (int i=0; i < dim(); i++) 
+    {
+      s += to_str (dat[i], "%6f") + to_str (' ');
     }
-    s+="]";
+  s += "]\n";
 #endif
-    return s;
+  return s;
 }
 
 
@@ -56,6 +59,6 @@ void
 Vector::print() const
 {
 #ifndef NDEBUG
-    fdebug << *this<<'\n';
+  fdebug << *this << '\n';
 #endif
 }