2003 -> 2004

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

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 69b14e891fad747b80d60bf6cb8b263a840dea46..be5f560d7e1e3bd17d1d76141b5a8f0a4f15eac5 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -1,7 +1,7 @@
 /*
   interval.hh -- part of flowerlib
   
-  (c) 1996 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef INTERVAL_HH
@@ -23,9 +23,9 @@ struct Interval_t : public Drul_array<T> {
   /* ************** */
     
   static T infinity () ;
-  static String T_to_str (T arg);
-  T center () {
-    assert (!empty_b ());
+  static String T_to_string (T arg);
+  T center () const {
+    assert (!is_empty ());
     return (elem (LEFT) + elem (RIGHT)) / T (2);
   }
   void translate (T t)
@@ -33,6 +33,11 @@ struct Interval_t : public Drul_array<T> {
       elem (LEFT) += t;
       elem (RIGHT) += t;
     }
+  void widen (T t)
+  {
+    elem (LEFT) -= t;
+    elem (RIGHT) += t;    
+  }
   
   /**
     PRE
@@ -40,16 +45,26 @@ struct Interval_t : public Drul_array<T> {
     */
   void unite (Interval_t<T> h);
   void intersect (Interval_t<T> h);
-
+  void add_point (T p) {
+    elem(LEFT) = elem (LEFT) <? p;
+    elem(RIGHT) = elem (RIGHT) >? p;
+  }
   T length () const;
+  T delta () const;
   void set_empty () ;
-  bool empty_b () const { return elem (LEFT) > elem (RIGHT); }
+  void set_full ();
+
+  /*
+    TODO: strip hungarian suffix.
+   */
+  bool is_empty () const { return elem (LEFT) > elem (RIGHT); }
   bool contains_b (Interval_t<T> const&) const;
   Interval_t () {
     set_empty ();
   }
   Interval_t (T m, T M) : Drul_array<T> (m,M)
-    {}
+    {
+    }
   Interval_t<T> &operator -= (T r) {
     *this += -r;
     return *this;
@@ -61,31 +76,38 @@ 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;
-       if (r < T (0)) {
-         T t = elem (LEFT);
-         elem (LEFT) = elem (RIGHT);
-         elem (RIGHT) = t;
-       }
+       if (r < T (0))
+         swap();
+
       }
     return *this;
   }
 
   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 str () const;    
-  void print () const;
-  bool elem_b (T r);
+  String to_string () const;    
+
+  bool contains (T r);
   void negate () {
     T r = -elem (LEFT);
     T l = -elem (RIGHT);
     elem (LEFT) = l;
     elem (RIGHT) =r;
   }
+  
+  void swap ()
+  {
+    T t = elem (LEFT);
+    elem (LEFT) = elem (RIGHT);
+    elem (RIGHT) = t;
+  }
 };