X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=e7c3063df234c6ce79bca6185bf9358e837e401b;hb=b3cf2199183a184c7eef9a9f8f3c9a691db1f0ad;hp=bfc97761c0efd940c373b72a5db02fcc916f12bd;hpb=9106e3bd374198c5457c35181ae1d66b3ec95236;p=lilypond.git diff --git a/lily/misc.cc b/lily/misc.cc index bfc97761c0..e7c3063df2 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -3,13 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include "misc.hh" -#include "string.hh" /* Return the 2-log, rounded down @@ -35,31 +34,6 @@ log_2 (double x) return log (x) / log (2.0); } -Array -split_string (String s, char c) -{ - Array rv; - while (s.length ()) - { - int i = s.index (c); - - if (i == 0) - { - s = s.nomid_string (0, 1); - continue; - } - - if (i < 0) - i = s.length (); - - rv.push (s.cut_string (0, i)); - s = s.nomid_string (0, i); - } - - return rv; -} - - Real directed_round (Real f, Direction d) { @@ -69,3 +43,15 @@ directed_round (Real f, Direction d) return ceil (f); } + + +/* + 0 at threshold, 1 at 0, with 1/x falloff. + */ +Real +peak_around (Real epsilon, Real threshold, Real x) +{ + if (x < 0) + return 1.0; + return max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0); +}