From: fred Date: Sun, 24 Mar 2002 19:29:00 +0000 (+0000) Subject: lilypond-0.0.26 X-Git-Tag: release/1.5.59~5546 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=022a32c6e5e9aadc623bfbdffc63056523ddd6a4;p=lilypond.git lilypond-0.0.26 --- diff --git a/src/beam.cc b/src/beam.cc index c36ca67436..abf94d157b 100644 --- a/src/beam.cc +++ b/src/beam.cc @@ -11,6 +11,8 @@ #include "lookup.hh" #include "grouping.hh" +NAME_METHOD(Beam); + struct Stem_info { Real x; Real idealy; @@ -60,7 +62,7 @@ void Beam::add(Stem*s) { stems.bottom().add(s); - s->dependencies.add(this); + s->dependencies.push(this); s->print_flag = false; } @@ -89,13 +91,13 @@ Beam::solve_slope() for (iter_top(stems,i); i.ok(); i++) { i->set_default_extents(); Stem_info info(i); - sinfo.add(info); + sinfo.push(info); } Real leftx = sinfo[0].x; Least_squares l; for (int i=0; i < sinfo.size(); i++) { sinfo[i].x -= leftx; - l.input.add(Offset(sinfo[i].x, sinfo[i].idealy)); + l.input.push(Offset(sinfo[i].x, sinfo[i].idealy)); } l.minimise(slope, left_pos); @@ -152,12 +154,12 @@ Beam::set_grouping(Rhythmic_grouping def, Rhythmic_grouping cur) for (; s.ok(); s++) { int f = intlog2(abs(s->flag))-2; assert(f>0); - flags.add(f); + flags.push(f); } int fi =0; b= cur.generate_beams(flags, fi); b.insert(0,0); - b.add(0); + b.push(0); assert(stems.size() == b.size()/2); } @@ -276,12 +278,11 @@ Beam::brew_molecule_p() const return out; } void -Beam::print()const +Beam::do_print()const { #ifndef NPRINT - mtor << "{ slope " < posns(sol); - posns.add(lp.eval(sol)); + posns.push(lp.eval(sol)); return posns; } @@ -197,7 +197,7 @@ void Spacing_problem::add_column(const PCol *col, bool fixed, Real fixpos) { Colinfo c(col,(fixed)? &fixpos : 0); - cols.add(c); + cols.push(c); } void @@ -209,7 +209,7 @@ Spacing_problem::add_ideal(const Idealspacing *i) if (!contains(l) || !contains(r)) { return; } - ideals.add(i); + ideals.push(i); } void