/*
- 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--2010 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 d = range_ideal_len (l, r);
Real c = range_stiffness (l, r, dist > d);
Real block_stretch = dist - d;
+
+ if (isinf (c) && block_stretch == 0) /* take care of the 0*infinity_f case */
+ return 0;
return c * block_stretch;
}
Real spring_dist = range_ideal_len (l, r);
if (spring_dist < dist)
for (int i = l; i < r; i++)
- springs_[i].set_distance (springs_[i].distance () * dist / spring_dist);
+ {
+ if (spring_dist)
+ springs_[i].set_distance (springs_[i].distance () * dist / spring_dist);
+ else
+ springs_[i].set_distance (dist / (r - l));
+ }
return;
}
for (vsize i=0; i < springs_.size (); i++)
inv_hooke += springs_[i].inverse_stretch_strength ();
+ if (inv_hooke == 0.0) /* avoid division by zero. If springs are infinitely stiff */
+ return 0.0; /* anyway, then it makes no difference what the force is */
+
assert (cur_len <= line_len_);
return (line_len_ - cur_len) / inv_hooke + force_;
}
{
Spring sp = sorted_springs[i];
- assert (sp.blocking_force () <= cur_force);
+ if (sp.blocking_force () > cur_force)
+ continue;
+
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 ();
}
/* Use a convex compression penalty. */
Real f = force_;
- return f - (f < 0 ? f*f*f*f*4 : 0);
+ return f - (f < 0 ? f*f*f*f*2 : 0);
}
/****************************************************************/