X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=e7c3063df234c6ce79bca6185bf9358e837e401b;hb=cd8d085d0ca2487e965483554850234931156e9a;hp=c9cb8e5dcfcb720a2bc51ebb3825c6fc1baab9b0;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index c9cb8e5dcf..e7c3063df2 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,119 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
-    Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <math.h>
 
 #include "misc.hh"
 
-#ifndef STANDALONE
-#include "item.hh"
-#endif
-
+/*
+  Return the 2-log, rounded down
+*/
 int
-intlog2(int d) {
-  int i=0;
-  while (!(d&1)) 
+intlog2 (int d)
+{
+  assert (d);
+  int i = 0;
+  while ((d != 1))
     {
-	d/= 2;
-	i++;
+      d /= 2;
+      i++;
     }
-  assert (!(d/2));
+
+  assert (! (d / 2));
   return i;
 }
 
 double
-log_2(double x) {
-  return log (x)  /log (2.0);
+log_2 (double x)
+{
+  return log (x) / log (2.0);
 }
 
-#ifndef STANDALONE
-Interval
-itemlist_width (const Array<Item*> &its)
+Real
+directed_round (Real f, Direction d)
 {
-  Interval iv ;
-  iv.set_empty();
-   
-  for (int j =0; j < its.size(); j++)
-    {
-	iv.unite (its[j]->width());
-
-    }
-  return iv;
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
 }
 
-#endif
 
 
 /*
-  TODO
-    group in some Array_*
-    make more generic / templatise
+   0 at threshold,  1 at 0, with 1/x falloff.
  */
-int
-get_lower_bound (Array<Real> const& positions, Real x)
+Real
+peak_around (Real epsilon,  Real threshold, Real x)
 {
-  if (x < positions[0])
-    return 0;
-  for (int i = 1; i < positions.size (); i++)
-    if (x < positions[i])
-      return i - 1;
-  return positions.size () - 1;
+  if (x < 0)
+    return 1.0;
+  return max (- epsilon * (x - threshold) / ((x + epsilon)  * threshold), 0.0);
 }
-
-Slice
-get_bounds_slice (Array<Real> const& positions, Real x)
-{
-  int l = get_lower_bound (positions, x);
-  int u = positions.size () - 1 <? l + 1;
-  if (x < positions[l])
-    u = l;
-  return Slice (l, u);
-}
-
-Interval
-get_bounds_iv (Array<Real> const& positions, Real x)
-{
-  Slice slice = get_bounds_slice (positions, x);
-  return Interval (positions[slice.min ()], positions[slice.max ()]);
-}
-
-// silly name
-Interval
-quantise_iv (Array<Real> const& positions, Real period, Real x)
-{
-  /*
-    ugh
-    assume that 
-      * positions are sorted, 
-      * positions are nonnegative
-      * period starts at zero
-   */
-
-  int n = (int)(x / period);
-  Real frac = (x / period - n) * period;
-  if (frac < 0)
-    {
-      frac += period;
-      n--;
-    }
-
-  Slice slice = get_bounds_slice (positions, frac);
-  Interval iv(positions[slice.min ()], positions[slice.max ()]);
-
-  if (slice.min () == slice.max ())
-    {
-      if (slice.min () == 0)
-	iv.min () = - period + positions.top ();
-      else
-	iv.max () = period + positions[0];
-    }
-
-  iv += period * n;
-
-  return iv;
-}
-