/*
- simple-spacer.cc -- implement Simple_spacer
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
-
- (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
TODO:
- add support for different stretch/shrink constants?
+
+ 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 <http://www.gnu.org/licenses/>.
*/
#include <cstdio>
Real
Simple_spacer::compress_line ()
{
- double inv_hooke = 0;
double cur_len = configuration_length (force_);
double cur_force = force_;
bool compressed = false;
}
fits_ = true;
- for (vsize i=0; i < springs_.size (); i++)
- inv_hooke += compressed
- ? springs_[i].inverse_compress_strength ()
- : springs_[i].inverse_stretch_strength ();
assert (line_len_ <= cur_len);
vector<Spring> sorted_springs = springs_;
sort (sorted_springs.begin (), sorted_springs.end (), greater<Spring> ());
- for (vsize i = 0; i < sorted_springs.size (); i++)
+ /* inv_hooke is the total flexibility of currently-active springs */
+ double inv_hooke = 0;
+ vsize i = sorted_springs.size ();
+ for ( ; i && sorted_springs[i - 1].blocking_force () < cur_force; i--)
+ inv_hooke += compressed
+ ? sorted_springs[i - 1].inverse_compress_strength ()
+ : sorted_springs[i - 1].inverse_stretch_strength ();
+ /* i now indexes the first active spring, so */
+ for ( ; i < sorted_springs.size (); i++)
{
Spring sp = sorted_springs[i];
- assert (sp.blocking_force () <= cur_force);
if (isinf (sp.blocking_force ()))
break;
}
cur_len -= block_dist;
- inv_hooke -= sp.inverse_compress_strength ();
+ inv_hooke -= compressed ? sp.inverse_compress_strength () : sp.inverse_stretch_strength ();
cur_force = sp.blocking_force ();
}