2003 -> 2004

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

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 44a5d9ce7cdf7eeccd2aaa9e433493400426d0fd..be5f560d7e1e3bd17d1d76141b5a8f0a4f15eac5 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -1,7 +1,7 @@
 /*
   interval.hh -- part of flowerlib
   
-  (c)  1996--2003 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef INTERVAL_HH
@@ -25,7 +25,7 @@ struct Interval_t : public Drul_array<T> {
   static T infinity () ;
   static String T_to_string (T arg);
   T center () const {
-    assert (!empty_b ());
+    assert (!is_empty ());
     return (elem (LEFT) + elem (RIGHT)) / T (2);
   }
   void translate (T t)
@@ -57,7 +57,7 @@ struct Interval_t : public Drul_array<T> {
   /*
     TODO: strip hungarian suffix.
    */
-  bool empty_b () const { return elem (LEFT) > elem (RIGHT); }
+  bool is_empty () const { return elem (LEFT) > elem (RIGHT); }
   bool contains_b (Interval_t<T> const&) const;
   Interval_t () {
     set_empty ();
@@ -76,7 +76,7 @@ struct Interval_t : public Drul_array<T> {
     return *this;
   }
   Interval_t<T> &operator *= (T r) {
-    if (!empty_b ())
+    if (!is_empty ())
       {
        elem (LEFT) *= r;
        elem (RIGHT) *= r;
@@ -88,11 +88,13 @@ struct Interval_t : public Drul_array<T> {
   }
 
   Real linear_combination (Real x) const {
-    return ((1.0 - x) * Real (elem (LEFT))  + (x + 1.0) * Real (elem (RIGHT))) * 0.5;
+    Drul_array<Real> da (elem (LEFT),
+                        elem (RIGHT));
+    return ::linear_combination (da, x);
   }
   String to_string () const;    
 
-  bool elem_b (T r);
+  bool contains (T r);
   void negate () {
     T r = -elem (LEFT);
     T l = -elem (RIGHT);