X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finterval.hh;h=9808bfaef652768c93d8bb97dd0b1f02716fd030;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3c319cf9d34fe67d289d3fd5e9fed4f9045e0112;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 3c319cf9d3..9808bfaef6 100644
--- 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,75 +51,77 @@ struct Interval_t : public Drul_array<T>
   void intersect (Interval_t<T> h);
   void add_point (T p)
   {
-    elem_ref (LEFT) = elem (LEFT) <? p;
-    elem_ref (RIGHT) = 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 ()
   {
     set_empty ();
   }
+  Interval_t (Drul_array<T> const &src)
+    : Drul_array<T> (src)
+  {
+  }
+
   Interval_t (T m, T M) : Drul_array<T> (m, M)
   {
   }
-  Interval_t<T> &operator-= (T r)
+  Interval_t<T> &operator -= (T r)
   {
     *this += -r;
     return *this;
   }
 
-  Interval_t<T> &operator+= (T r)
+  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)
+  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);
+  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 bool left_less (Interval_t<T> const &a, Interval_t<T> const &b)
+  {
+    return a[LEFT] < b[RIGHT];
   }
 };
 
@@ -126,14 +129,14 @@ struct Interval_t : public Drul_array<T>
    inclusion ordering. Crash if not  comparable.
 */
 template<class T>
-int Interval__compare (const Interval_t<T>&, Interval_t<T> const &);
+int Interval__compare (const Interval_t<T> &, Interval_t<T> const &);
 
 /**
    Inclusion ordering.  return -2 if not comparable
 */
 template<class T>
 int
-_Interval__compare (const Interval_t<T>&a, Interval_t<T> const &b);
+_Interval__compare (const Interval_t<T> &a, Interval_t<T> const &b);
 
 /*
   INLINE
@@ -141,7 +144,7 @@ _Interval__compare (const Interval_t<T>&a, Interval_t<T> const &b);
 
 #include "compare.hh"
 
-TEMPLATE_INSTANTIATE_COMPARE (Interval_t<T>&, Interval__compare, template<class T>);
+TEMPLATE_INSTANTIATE_COMPARE (Interval_t<T> &, Interval__compare, template<class T>);
 
 template<class T>
 inline Interval_t<T>
@@ -149,12 +152,11 @@ intersection (Interval_t<T> a, Interval_t<T> const &b)
 {
   a.intersect (b);
   return a;
-
 }
 
 template<class T>
 inline
-Interval_t<T> operator+ (T a, Interval_t<T> i)
+Interval_t<T> operator + (T a, Interval_t<T> i)
 {
   i += a;
   return i;
@@ -162,7 +164,7 @@ Interval_t<T> operator+ (T a, Interval_t<T> i)
 
 template<class T>
 inline
-Interval_t<T> operator- (Interval_t<T> i, T a)
+Interval_t<T> operator - (Interval_t<T> i, T a)
 {
   i += -a;
   return i;
@@ -170,7 +172,7 @@ Interval_t<T> operator- (Interval_t<T> i, T a)
 
 template<class T>
 inline
-Interval_t<T> operator- (T a, Interval_t<T> i)
+Interval_t<T> operator - (T a, Interval_t<T> i)
 {
   i.negate ();
   i += a;
@@ -179,14 +181,14 @@ Interval_t<T> operator- (T a, Interval_t<T> i)
 
 template<class T>
 inline
-Interval_t<T> operator+ (Interval_t<T> i, T a)
+Interval_t<T> operator + (Interval_t<T> i, T a)
 {
   return a + i;
 }
 
 template<class T>
 inline
-Interval_t<T> operator* (T a, Interval_t<T> i)
+Interval_t<T> operator * (T a, Interval_t<T> i)
 {
   i *= a;
   return i;
@@ -194,9 +196,9 @@ Interval_t<T> operator* (T a, Interval_t<T> i)
 
 template<class T>
 inline
-Interval_t<T> operator* (Interval_t<T> i, T a)
+Interval_t<T> operator * (Interval_t<T> i, T a)
 {
-  return a*i;
+  return a * i;
 }
 
 template<class T>
@@ -204,10 +206,9 @@ inline T
 Interval_t<T>::center () const
 {
   assert (!is_empty ());
-  return (elem (LEFT) + elem (RIGHT)) / T (2);
+  return (at (LEFT) + at (RIGHT)) / T (2);
 }
 
-// again? see flower-proto.hh
 typedef Interval_t<Real> Interval;
 typedef Interval_t<int> Slice;	// weird name