X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fmatrix.hh;h=ac4c4327ebbd2bbb39cef80be44a14a71d737f8b;hb=42984d05239a3c3be1ea859ba5214ce140448afc;hp=d9b32c2ee47569e9c09470e271707c68f06e438d;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git diff --git a/flower/include/matrix.hh b/flower/include/matrix.hh index d9b32c2ee4..ac4c4327eb 100644 --- a/flower/include/matrix.hh +++ b/flower/include/matrix.hh @@ -1,9 +1,20 @@ /* - matrix.hh -- declare and implement 2d arrays + This file is part of LilyPond, the GNU music typesetter. - source file of the Flower Library + Copyright (C) 2006--2011 Joe Neeman - (c) 2006--2007 Joe Neeman + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #ifndef MATRIX_HH @@ -11,7 +22,7 @@ #include "std-vector.hh" -template > +template > class Matrix { public: @@ -21,7 +32,7 @@ public: } Matrix (vsize rows, vsize columns, T const &t) - : data_(rows * columns, t) + : data_ (rows *columns, t) { rank_ = rows; } @@ -46,15 +57,15 @@ public: data_.resize (rows * columns, t); else { - vector new_data; - new_data.resize (rows * columns, t); - vsize cur_cols = rank_ ? data_.size () / rank_: 0; - - for (vsize i = 0; i < cur_cols; i++) - for (vsize j = 0; j < rank_; j++) - new_data[i*rows + j] = data_[i*rank_ + j]; - rank_ = rows; - data_ = new_data; + vector new_data; + new_data.resize (rows * columns, t); + vsize cur_cols = rank_ ? data_.size () / rank_ : 0; + + for (vsize i = 0; i < cur_cols; i++) + for (vsize j = 0; j < rank_; j++) + new_data[i * rows + j] = data_[i * rank_ + j]; + rank_ = rows; + data_ = new_data; } }