X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finterval.tcc;h=5ff1e416657d57bc781ca944a75471074000776d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=efb7644133f4203dd8a9d5e4fca81868587ffb7d;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index efb7644133..5ff1e41665 100644
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -3,125 +3,127 @@
 
   source file of the Flower Library
 
-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef INTERVAL_TCC
 #define INTERVAL_TCC
 
-#include <assert.h> 
-#include <math.h>
+#include <cassert>
+
 #include "interval.hh"
-#include "string.hh"
+#include "std-string.hh"
 
+// MacOS 10.3 problems:
+// #include <cmath>
+using namespace std;
 
 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.at (LEFT) == b.at (LEFT) && a.at (RIGHT) == b.at (RIGHT))
+    return 0;
+
+  if (a.at (LEFT) <= b.at (LEFT) && a.at (RIGHT) >= b.at (RIGHT))
+    return 1;
 
-    if (a.left >= b.left && a.right <= b.right)
-	return -1;
+  if (a.at (LEFT) >= b.at (LEFT) && a.at (RIGHT) <= b.at (RIGHT))
+    return -1;
 
-    return -2;
+  return -2;
 }
 
 template<class T>
-bool 
-Interval_t<T>::contains_b (Interval_t<T> const& a)const
+bool
+Interval_t<T>::superset (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 (Interval_t<T> const &a, Interval_t<T> const &b)
 {
-    int i = _Interval__compare (a,b);
-    if (i < -1)
-	assert (false);
-    return i;
+  int i = _Interval__compare (a, b);
+  if (i < -1)
+    assert (false);
+  return i;
 }
 
 template<class T>
 void
-Interval_t<T>::set_empty()
+Interval_t<T>::set_empty ()
 {
-    left = (T) infinity();
-    right = (T) -infinity();
+  at (LEFT) = (T) infinity ();
+  at (RIGHT) = (T) -infinity ();
 }
 
 template<class T>
-T
-Interval_t<T>::length() const {
-    assert (right >= left);
-    return right-left;
+void
+Interval_t<T>::set_full ()
+{
+  at (LEFT) = (T) -infinity ();
+  at (RIGHT) = (T) infinity ();
 }
 
 template<class T>
-void
-Interval_t<T>::unite (Interval_t<T> h)
+T
+Interval_t<T>::length () const
 {
-    if (h.left<left)
-	left = h.left;
-    if (h.right>right)
-	right = h.right;
+  if (at (RIGHT) <= at (LEFT))
+    return 0;
+  else
+    return at (RIGHT) - at (LEFT);
 }
 
-/**
-  smallest Interval which includes *this and #h#
- */
+template<class T>
+T
+Interval_t<T>::delta () const
+{
+  return at (RIGHT) - at (LEFT);
+}
 
+/* smallest Interval which includes *this and #h#  */
 template<class T>
 void
-Interval_t<T>::intersect (Interval_t<T> h)
+Interval_t<T>::unite (Interval_t<T> h)
 {
-#if defined (__GNUG__) && ! defined (__STRICT_ANSI__)
-    left = h.left >? left;
-    right = h.right <?right;
-#else
-    left = max (h.left, left);
-    right = min (h.right, right);
-#endif
+  at (LEFT) = min (h.at (LEFT), at (LEFT));
+  at (RIGHT) = max (h.at (RIGHT), at (RIGHT));
 }
 
 template<class T>
-Interval_t<T>
-intersect (Interval_t<T> x, Interval_t<T> const &y)
+void
+Interval_t<T>::intersect (Interval_t<T> h)
 {
-    x.intersect (y);
-    return x;
+  at (LEFT) = max (h.at (LEFT), at (LEFT));
+  at (RIGHT) = min (h.at (RIGHT), at (RIGHT));
 }
 
 template<class T>
-String
-Interval_t<T>::str() const
+string
+Interval_t<T>::to_string () const
 {
-    if (empty_b())
-	return "[empty]";
-    String s ("[");
- 
-    return s + String (left) + String ("," ) + String (right ) + String ("]" );
+  if (is_empty ())
+    return "[empty]";
+  string s ("[");
+
+  return (s + T_to_string (at (LEFT)) + string (",")
+	  + T_to_string (at (RIGHT)) + string ("]"));
 }
 
 template<class T>
 bool
-Interval_t<T>::elt_b (T r)
+Interval_t<T>::contains (T r) const
 {
-    return r >= left && r <= right;
+  return r >= at (LEFT) && r <= at (RIGHT);
 }
 
-
-#define INTERVAL__INSTANTIATE(T) struct Interval_t<T>;\
-  template  int Interval__compare(const Interval_t<T>&,Interval_t<T> const&)
+#define INTERVAL__INSTANTIATE(T) struct Interval_t<T>;			\
+  template int Interval__compare (const Interval_t<T> &, Interval_t<T> const &)
 
 #endif // INTERVAL_TCC