Run `make grand-replace'.

[lilypond.git] / flower / include / interval.hh

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 08a48a9898e92658a79e223be05eaa70f2ab965e..9808bfaef652768c93d8bb97dd0b1f02716fd030 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -1,12 +1,14 @@
 /*
   interval.hh -- part of flowerlib
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2008 Han-Wen Nienhuys
 */
 
 #ifndef INTERVAL_HH
 #define INTERVAL_HH
 
+#include <math.h>
+
 #include "flower-proto.hh"
 #include "drul-array.hh"
 
@@ -16,29 +18,28 @@
 template<class T>
 struct Interval_t : public Drul_array<T>
 {
-  Drul_array<T>::elem;
-  Drul_array<T>::elem_ref;
+  Drul_array<T>::at;
 
   static T infinity ();
-  static String T_to_string (T arg);
+  static string T_to_string (T arg);
   T center () const;
   void translate (T t)
   {
-    elem_ref (LEFT) += t;
-    elem_ref (RIGHT) += t;
+    at (LEFT) += t;
+    at (RIGHT) += t;
   }
   void widen (T t)
   {
-    elem_ref (LEFT) -= t;
-    elem_ref (RIGHT) += t;
+    at (LEFT) -= t;
+    at (RIGHT) += t;
   }
 
   T distance (T t) const
   {
-    if (t > elem (RIGHT))
-      return T (t - elem (RIGHT));
-    else if (t < elem (LEFT))
-      return T (elem (LEFT) - t);
+    if (t > at (RIGHT))
+      return T (t - at (RIGHT));
+    else if (t < at (LEFT))
+      return T (at (LEFT) - t);
     else
       return T (0);
   }
@@ -50,20 +51,17 @@ struct Interval_t : public Drul_array<T>
   void intersect (Interval_t<T> h);
   void add_point (T p)
   {
-    elem_ref (LEFT) = min (elem (LEFT), p);
-    elem_ref (RIGHT) = max (elem (RIGHT), p);
+    at (LEFT) = min (at (LEFT), p);
+    at (RIGHT) = max (at (RIGHT), p);
   }
   T length () const;
   T delta () const;
   void set_empty ();
   void set_full ();
 
-  /*
-    TODO: strip hungarian suffix.
-  */
   bool is_empty () const
   {
-    return elem (LEFT) > elem (RIGHT);
+    return at (LEFT) > at (RIGHT);
   }
   bool superset (Interval_t<T> const &) const;
   Interval_t ()
@@ -86,48 +84,44 @@ struct Interval_t : public Drul_array<T>
 
   Interval_t<T> &operator += (T r)
   {
-    elem_ref (LEFT) += r;
-    elem_ref (RIGHT) += r;
+    at (LEFT) += r;
+    at (RIGHT) += r;
     return *this;
   }
   Interval_t<T> &operator *= (T r)
   {
     if (!is_empty ())
       {
-       elem_ref (LEFT) *= r;
-       elem_ref (RIGHT) *= r;
+       at (LEFT) *= r;
+       at (RIGHT) *= r;
        if (r < T (0))
          swap ();
       }
     return *this;
   }
 
-  Real linear_combination (Real x) const
-  {
-    Drul_array<Real> da (elem (LEFT), elem (RIGHT));
-    return ::linear_combination (da, x);
-  }
-  String to_string () const;
+  Real linear_combination (Real x) const;
+  string to_string () const;
 
   bool contains (T r) const;
   void negate ()
   {
-    T r = -elem (LEFT);
-    T l = -elem (RIGHT);
-    elem_ref (LEFT) = l;
-    elem_ref (RIGHT) = r;
+    T r = -at (LEFT);
+    T l = -at (RIGHT);
+    at (LEFT) = l;
+    at (RIGHT) = r;
   }
 
   void swap ()
   {
-    T t = elem (LEFT);
-    elem_ref (LEFT) = elem (RIGHT);
-    elem_ref (RIGHT) = t;
+    T t = at (LEFT);
+    at (LEFT) = at (RIGHT);
+    at (RIGHT) = t;
   }
 
-  static int left_comparison (Interval_t<T> const &a, Interval_t<T> const &b)
+  static bool left_less (Interval_t<T> const &a, Interval_t<T> const &b)
   {
-    return sign (a[LEFT] - b[RIGHT]);
+    return a[LEFT] < b[RIGHT];
   }
 };
 
@@ -212,7 +206,7 @@ inline T
 Interval_t<T>::center () const
 {
   assert (!is_empty ());
-  return (elem (LEFT) + elem (RIGHT)) / T (2);
+  return (at (LEFT) + at (RIGHT)) / T (2);
 }
 
 typedef Interval_t<Real> Interval;