release: 0.1.11

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

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index efb7644133f4203dd8a9d5e4fca81868587ffb7d..1a483b5f188a58a8f527a3429767e283b0b310ba 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -20,50 +20,53 @@ template<class T>
 int
 _Interval__compare (const Interval_t<T>&a,Interval_t<T> const&b)
 {
-    if (a.left == b.left && a.right == b.right)
+  if (a.left == b.left && a.right == b.right)
        return 0;
-    
-    if (a.left <= b.left && a.right >= b.right)
+  
+  if (a.left <= b.left && a.right >= b.right)
        return 1;
 
-    if (a.left >= b.left && a.right <= b.right)
+  if (a.left >= b.left && a.right <= b.right)
        return -1;
 
-    return -2;
+  return -2;
 }
 
 template<class T>
 bool 
-Interval_t<T>::contains_b (Interval_t<T> const& a)const
+Interval_t<T>::contains_b (Interval_t<T> const& a) const
 {
-    int c_i= _Interval__compare (*this, a);
-    if (c_i == -2)
+  int c_i= _Interval__compare (*this, a);
+  if (c_i == -2)
        return false;
-    return c_i >= 0;
+  return c_i >= 0;
 }
 
 template<class T>
 int
 Interval__compare (const Interval_t<T>&a,Interval_t<T> const&b)
 {
-    int i = _Interval__compare (a,b);
-    if (i < -1)
+  int i = _Interval__compare (a,b);
+  if (i < -1)
        assert (false);
-    return i;
+  return i;
 }
 
 template<class T>
 void
 Interval_t<T>::set_empty()
 {
-    left = (T) infinity();
-    right = (T) -infinity();
+  left = (T) infinity();
+  right = (T) -infinity();
 }
 
 template<class T>
 T
-Interval_t<T>::length() const {
-    assert (right >= left);
+Interval_t<T>::length() const 
+{
+  if (right < left) 
+    return 0;
+  else 
     return right-left;
 }
 
@@ -71,9 +74,9 @@ template<class T>
 void
 Interval_t<T>::unite (Interval_t<T> h)
 {
-    if (h.left<left)
+  if (h.left<left)
        left = h.left;
-    if (h.right>right)
+  if (h.right>right)
        right = h.right;
 }
 
@@ -86,11 +89,11 @@ void
 Interval_t<T>::intersect (Interval_t<T> h)
 {
 #if defined (__GNUG__) && ! defined (__STRICT_ANSI__)
-    left = h.left >? left;
-    right = h.right <?right;
+  left = h.left >? left;
+  right = h.right <?right;
 #else
-    left = max (h.left, left);
-    right = min (h.right, right);
+  left = max (h.left, left);
+  right = min (h.right, right);
 #endif
 }
 
@@ -98,26 +101,26 @@ template<class T>
 Interval_t<T>
 intersect (Interval_t<T> x, Interval_t<T> const &y)
 {
-    x.intersect (y);
-    return x;
+  x.intersect (y);
+  return x;
 }
 
 template<class T>
 String
 Interval_t<T>::str() const
 {
-    if (empty_b())
+  if (empty_b())
        return "[empty]";
-    String s ("[");
+  String s ("[");
  
-    return s + String (left) + String ("," ) + String (right ) + String ("]" );
+  return s + String (left) + String ("," ) + String (right ) + String ("]" );
 }
 
 template<class T>
 bool
 Interval_t<T>::elt_b (T r)
 {
-    return r >= left && r <= right;
+  return r >= left && r <= right;
 }