release: 0.1.61

[lilypond.git] / flower / full-storage.cc

diff --git a/flower/full-storage.cc b/flower/full-storage.cc
index 71aa74c10c6f0aa1cb7b582fb20c8d296dbe3ed4..4fc5605cfb01b5d8f0e706bca174369b9b329362 100644 (file)
--- a/flower/full-storage.cc
+++ b/flower/full-storage.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include "full-storage.hh"
@@ -16,8 +16,8 @@ Full_storage::operator=(Full_storage const &fs)
   OK();
   fs.OK();
   for (int i=0; i<height_i_; i++)
-       for (int j=0; j<width_i_; j++)
-           els_p_p_[i][j]= fs.els_p_p_[i][j];
+    for (int j=0; j<width_i_; j++)
+      els_p_p_[i][j]= fs.els_p_p_[i][j];
 }
 
 
@@ -25,7 +25,6 @@ void
 Full_storage::OK() const
 {
 #ifndef NDEBUG
-
   assert (max_height_i_ >= height_i_ && max_width_i_ >= width_i_);
   assert (height_i_ >= 0 && width_i_ >= 0);
   assert (els_p_p_||!max_height_i_);
@@ -38,69 +37,26 @@ Full_storage::OK() const
 Full_storage::~Full_storage() 
 {
   for (int i=0; i < max_height_i_; i++)
-       delete [] els_p_p_[i];
+    delete [] els_p_p_[i];
   delete[] els_p_p_;
 }
 
 void
-
 Full_storage::resize (int rows, int cols)
 {
   OK();
   resize_cols (rows);
   resize_rows (cols);
+  band_i_ = rows >? cols;
 }
 
-
-
-bool
-Full_storage::mult_ok (int i, int) const
-{
-  return i < height_i_;
-}
-
-
-bool
-Full_storage::trans_ok (int , int j) const
-{
-     return j < width_i_;
-} 
-
-
-
-void
-Full_storage::trans_next (int &i, int &j) const
-{
-  assert (trans_ok (i,j));
-  i++;
-  if (i >= height_i_) 
-    {
-       i=0;
-       j ++;
-    }
-}
-
-
-void
-Full_storage::mult_next (int &i, int &j) const
-{
-  assert (mult_ok (i,j));
-  j++;
-  if (j >= width_i_) 
-    {
-       j=0;
-       i++;
-    }
-}
-
-
 void
 Full_storage::delete_column (int k)
 {
   assert (0 <= k &&k<width_i_);    
   for (int i=0; i< height_i_ ; i++)
-       for (int j=k+1; j <width_i_; j++)
-           els_p_p_[i][j-1]=els_p_p_[i][j];
+    for (int j=k+1; j <width_i_; j++)
+      els_p_p_[i][j-1]=els_p_p_[i][j];
   width_i_--;
 }
 
@@ -110,8 +66,8 @@ Full_storage::delete_row (int k)
 {
   assert (0 <= k &&k<height_i_);
   for (int i=k+1; i < height_i_ ; i++)
-       for (int j=0; j < width_i_; j++)
-           els_p_p_[i-1][j]=els_p_p_[i][j];
+    for (int j=0; j < width_i_; j++)
+      els_p_p_[i-1][j]=els_p_p_[i][j];
   height_i_--;
 }
 
@@ -123,51 +79,58 @@ Full_storage::insert_row (int k)
   assert (0 <= k&& k <=height_i_);
   resize_cols (height_i_+1);
   for (int i=height_i_-1; i > k ; i--)
-       for (int j=0; j <width_i_; j++)
-           els_p_p_[i][j]=els_p_p_[i-1][j];
+    for (int j=0; j <width_i_; j++)
+      els_p_p_[i][j]=els_p_p_[i-1][j];
 
 }
+Array<Real>
+Full_storage::row (int n) const
+{
+  Array<Real> r;
+  for (int j = 0; j < cols(); j++)
+    r.push (elem (n,j));
+  return r;
+}
 
-bool
-Full_storage::try_right_multiply (Matrix_storage * dest, Matrix_storage const * right) const
+Array<Real>
+Full_storage::column (int n) const
+{
+  Array<Real> r;
+  for (int i = 0; i < rows(); i++)
+    r.push (elem (i,n));
+  return r;
+}
+
+void
+Full_storage::set_size (int rows, int cols)
 {
-  if (dest->name() != Full_storage::static_name () ||
-       right->name() != Full_storage::static_name ())
-       return false;
-
-  Full_storage *d_l = (Full_storage*)dest;
-  Full_storage *r_l = (Full_storage*)right;
-  
-  d_l->set_size (height_i_, r_l->width_i_);
-  for (int i=0; i < d_l->height_i_; i++)
-       for (int j = 0; j < d_l->width_i_; j++) 
-         {
-           Real &r (d_l->els_p_p_[i][j]);
-           r=0.0;
-           for (int k = 0; k < width_i_; k++)
-               r += els_p_p_[i][k] * r_l->els_p_p_[k][j];
-           
-         }
-  return true;
-  
-  
+  resize (rows,cols);
 }
-IMPLEMENT_IS_TYPE_B1(Full_storage,Matrix_storage);
+       
+void
+Full_storage::set_size (int rows)
+{
+      
+  resize (rows);
+}
+       
+
+
 void
 Full_storage::resize_cols (int newh)
 {
   if (newh <= max_height_i_) 
     {
-       height_i_=newh;
-       return;
+      height_i_=newh;
+      return;
     }
    
   Real ** newa=new Real*[newh];
   int j=0;
   for (; j < height_i_; j++)
-       newa[j] = els_p_p_[j];
+    newa[j] = els_p_p_[j];
   for (; j < newh; j++)
-       newa[j] = new Real[max_width_i_];
+    newa[j] = new Real[max_width_i_];
   delete[] els_p_p_;
   els_p_p_=newa;
 
@@ -176,34 +139,22 @@ Full_storage::resize_cols (int newh)
 
 
 
-Full_storage::Full_storage (Matrix_storage*m)
-{
-  set_size (m->rows(), m->cols ());
-  if ( !m->is_type_b ( Full_storage::static_name()))
-       for (int i=0; i<height_i_; i++)
-           for (int j=0; j<width_i_; j++)
-               els_p_p_[i][j]=0.0;
-  for (int i,j=0; m->mult_ok (i,j); m->mult_next (i,j))
-       els_p_p_[i][j] = m->elem (i,j);
-}
-
-
 void
 Full_storage::resize_rows (int neww)
 {
   if (neww <= max_width_i_) 
     {
-       width_i_=neww;
-       return;
+      width_i_=neww;
+      return;
     }
   for (int i=0; i < max_height_i_ ; i++) 
     {
-       Real* newa = new Real[neww];
-       for (int k=0; k < width_i_; k++)
-           newa[k] = els_p_p_[i][k];
+      Real* newa = new Real[neww];
+      for (int k=0; k < width_i_; k++)
+       newa[k] = els_p_p_[i][k];
 
-       delete[] els_p_p_[i];
-       els_p_p_[i] = newa;
+      delete[] els_p_p_[i];
+      els_p_p_[i] = newa;
     }
   width_i_ = max_width_i_ = neww;      
 }
@@ -213,4 +164,5 @@ Full_storage::resize_rows (int neww)
 #endif
 #define INLINE
 
+
 #include "full-storage.icc"