Imported sources

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

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index ab2eb95ec3b72f53c0c172c89574b303fca92312..79e7c548e61ca374162e7069a09527ac729a24f3 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -1,3 +1,15 @@
+/*
+  interval.tcc -- implement Interval_t
+
+  source file of the Flower Library
+
+  (c)  1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+
+#ifndef INTERVAL_TCC
+#define INTERVAL_TCC
+
 #include <assert.h> 
 #include <math.h>
 #include "interval.hh"
@@ -6,104 +18,133 @@
 
 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)
 {
-    if (a.left == b.left && a.right == b.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 0;
+  
+  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;
+  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)
-       return false;
-    return c_i >= 0;
+  int c_i= _Interval__compare (*this, a);
+  if (c_i == -2)
+    return false;
+  return c_i >= 0;
 }
 
 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)
+{
+  int i = _Interval__compare (a,b);
+  if (i < -1)
+    assert (false);
+  return i;
+}
+
+template<class T>
+void
+Interval_t<T>::set_empty ()
 {
-    int i = _Interval__compare(a,b);
-    if (i < -1)
-       assert(false);
-    return i;
+  elem (LEFT) = (T) infinity ();
+  elem (RIGHT) = (T) -infinity ();
 }
 
 template<class T>
 void
-Interval_t<T>::set_empty()
+Interval_t<T>::set_full ()
 {
-    left = (T) infinity();
-    right = (T) -infinity();
+  elem (LEFT) = (T) -infinity ();
+  elem (RIGHT) = (T) infinity ();
 }
 
 template<class T>
 T
-Interval_t<T>::length() const {
-    assert(right >= left);
-    return right-left;
+Interval_t<T>::length () const 
+{
+  if (elem (RIGHT) <= elem (LEFT)) 
+    return 0;
+  else 
+    return elem (RIGHT)-elem (LEFT);
 }
 
 template<class T>
-void
-Interval_t<T>::unite(Interval_t<T> h)
+T
+Interval_t<T>::delta () const 
 {
-    if (h.left<left)
-       left = h.left;
-    if (h.right>right)
-       right = h.right;
+  return elem (RIGHT) - elem (LEFT);
 }
 
 /**
   smallest Interval which includes *this and #h#
  */
+template<class T>
+void
+Interval_t<T>::unite (Interval_t<T> h)
+{
+  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
+}
+
 
 template<class T>
 void
-Interval_t<T>::intersect(Interval_t<T> h)
+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
 }
 
 template<class T>
 Interval_t<T>
-intersect(Interval_t<T> x, Interval_t<T> const &y)
+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
+Interval_t<T>::to_string () const
 {
-    if (empty_b())
-       return "[empty]";
-    String s("[");
+  if (is_empty ())
+    return "[empty]";
+  String s ("[");
  
-    return s + String( left ) + String( "," ) + String( right ) + String( "]" );
+  return s + T_to_string (elem (LEFT)) + String ("," ) + T_to_string (elem (RIGHT) ) + String ("]" );
 }
 
 template<class T>
 bool
-Interval_t<T>::elt_b(T r)
+Interval_t<T>::contains (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&)
+
+#endif // INTERVAL_TCC