release: 1.3.19

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

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 1a483b5f188a58a8f527a3429767e283b0b310ba..7c51bd18f3879ba6d554d890d507fe2cff9c49b8 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,20 +14,28 @@
 #include <math.h>
 #include "interval.hh"
 #include "string.hh"
+#include "flower-debug.hh"
 
+template<class T>
+void
+Interval_t<T>::print () const
+{
+  if (flower_dstream)
+    *flower_dstream << str ();
+}
 
 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)
-       return 0;
+  if (a.elem (LEFT) == b.elem (LEFT) && a.elem (RIGHT) == b.elem (RIGHT))
+    return 0;
   
-  if (a.left <= b.left && a.right >= b.right)
-       return 1;
+  if (a.elem (LEFT) <= b.elem (LEFT) && a.elem (RIGHT) >= b.elem (RIGHT))
+    return 1;
 
-  if (a.left >= b.left && a.right <= b.right)
-       return -1;
+  if (a.elem (LEFT) >= b.elem (LEFT) && a.elem (RIGHT) <= b.elem (RIGHT))
+    return -1;
 
   return -2;
 }
@@ -38,7 +46,7 @@ Interval_t<T>::contains_b (Interval_t<T> const& a) const
 {
   int c_i= _Interval__compare (*this, a);
   if (c_i == -2)
-       return false;
+    return false;
   return c_i >= 0;
 }
 
@@ -48,7 +56,7 @@ Interval__compare (const Interval_t<T>&a,Interval_t<T> const&b)
 {
   int i = _Interval__compare (a,b);
   if (i < -1)
-       assert (false);
+    assert (false);
   return i;
 }
 
@@ -56,44 +64,49 @@ template<class T>
 void
 Interval_t<T>::set_empty()
 {
-  left = (T) infinity();
-  right = (T) -infinity();
+  elem (LEFT) = (T) infinity();
+  elem (RIGHT) = (T) -infinity();
 }
 
 template<class T>
 T
 Interval_t<T>::length() const 
 {
-  if (right < left) 
+  if (elem (RIGHT) < elem (LEFT)) 
     return 0;
   else 
-    return right-left;
+    return elem (RIGHT)-elem (LEFT);
 }
 
+/**
+  smallest Interval which includes *this and #h#
+ */
 template<class T>
 void
 Interval_t<T>::unite (Interval_t<T> h)
 {
-  if (h.left<left)
-       left = h.left;
-  if (h.right>right)
-       right = h.right;
+  elem (LEFT) = h.elem (LEFT) <? elem (LEFT);
+  elem (RIGHT) = h.elem (RIGHT) >?elem (RIGHT);
+
+#if 0
+  if (h.elem (LEFT)<elem (LEFT))
+    elem (LEFT) = h.elem (LEFT);
+  if (h.elem (RIGHT)>elem (RIGHT))
+  elem (RIGHT) = h.elem (RIGHT);
+#endif
 }
 
-/**
-  smallest Interval which includes *this and #h#
- */
 
 template<class T>
 void
 Interval_t<T>::intersect (Interval_t<T> h)
 {
 #if defined (__GNUG__) && ! defined (__STRICT_ANSI__)
-  left = h.left >? left;
-  right = h.right <?right;
+  elem (LEFT) = h.elem (LEFT) >? elem (LEFT);
+  elem (RIGHT) = h.elem (RIGHT) <?elem (RIGHT);
 #else
-  left = max (h.left, left);
-  right = min (h.right, right);
+  elem (LEFT) = max (h.elem (LEFT), elem (LEFT));
+  elem (RIGHT) = min (h.elem (RIGHT), elem (RIGHT));
 #endif
 }
 
@@ -110,21 +123,21 @@ String
 Interval_t<T>::str() const
 {
   if (empty_b())
-       return "[empty]";
+    return "[empty]";
   String s ("[");
  
-  return s + String (left) + String ("," ) + String (right ) + String ("]" );
+  return s + T_to_str (elem (LEFT)) + String ("," ) + T_to_str (elem (RIGHT) ) + String ("]" );
 }
 
 template<class T>
 bool
-Interval_t<T>::elt_b (T r)
+Interval_t<T>::elem_b (T r)
 {
-  return r >= left && r <= right;
+  return r >= elem (LEFT) && r <= elem (RIGHT);
 }
 
 
 #define INTERVAL__INSTANTIATE(T) struct Interval_t<T>;\
-  template  int Interval__compare(const Interval_t<T>&,Interval_t<T> const&)
+template  int Interval__compare(const Interval_t<T>&,Interval_t<T> const&)
 
 #endif // INTERVAL_TCC