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

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 60f23fab09..5ff1e41665 100644
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -3,40 +3,42 @@
 
   source file of the Flower Library
 
-  (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.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.elem (LEFT) == b.elem (LEFT) && a.elem (RIGHT) == b.elem (RIGHT))
+  if (a.at (LEFT) == b.at (LEFT) && a.at (RIGHT) == b.at (RIGHT))
     return 0;
-  
-  if (a.elem (LEFT) <= b.elem (LEFT) && a.elem (RIGHT) >= b.elem (RIGHT))
+
+  if (a.at (LEFT) <= b.at (LEFT) && a.at (RIGHT) >= b.at (RIGHT))
     return 1;
 
-  if (a.elem (LEFT) >= b.elem (LEFT) && a.elem (RIGHT) <= b.elem (RIGHT))
+  if (a.at (LEFT) >= b.at (LEFT) && a.at (RIGHT) <= b.at (RIGHT))
     return -1;
 
   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);
+  int c_i = _Interval__compare (*this, a);
   if (c_i == -2)
     return false;
   return c_i >= 0;
@@ -44,9 +46,9 @@ Interval_t<T>::contains_b (Interval_t<T> const& a) const
 
 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);
+  int i = _Interval__compare (a, b);
   if (i < -1)
     assert (false);
   return i;
@@ -56,95 +58,72 @@ template<class T>
 void
 Interval_t<T>::set_empty ()
 {
-  elem (LEFT) = (T) infinity ();
-  elem (RIGHT) = (T) -infinity ();
+  at (LEFT) = (T) infinity ();
+  at (RIGHT) = (T) -infinity ();
 }
 
 template<class T>
 void
 Interval_t<T>::set_full ()
 {
-  elem (LEFT) = (T) -infinity ();
-  elem (RIGHT) = (T) infinity ();
+  at (LEFT) = (T) -infinity ();
+  at (RIGHT) = (T) infinity ();
 }
 
 template<class T>
 T
-Interval_t<T>::length () const 
+Interval_t<T>::length () const
 {
-  if (elem (RIGHT) <= elem (LEFT)) 
+  if (at (RIGHT) <= at (LEFT))
     return 0;
-  else 
-    return elem (RIGHT)-elem (LEFT);
+  else
+    return at (RIGHT) - at (LEFT);
 }
 
 template<class T>
 T
-Interval_t<T>::delta () const 
+Interval_t<T>::delta () const
 {
-  return elem (RIGHT) - elem (LEFT);
+  return at (RIGHT) - at (LEFT);
 }
 
-/**
-  smallest Interval which includes *this and #h#
- */
+/* 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
+  at (LEFT) = min (h.at (LEFT), at (LEFT));
+  at (RIGHT) = max (h.at (RIGHT), at (RIGHT));
 }
 
-
 template<class T>
 void
 Interval_t<T>::intersect (Interval_t<T> h)
 {
-#if defined (__GNUG__) && ! defined (__STRICT_ANSI__)
-  elem (LEFT) = h.elem (LEFT) >? elem (LEFT);
-  elem (RIGHT) = h.elem (RIGHT) <?elem (RIGHT);
-#else
-  elem (LEFT) = max (h.elem (LEFT), elem (LEFT));
-  elem (RIGHT) = min (h.elem (RIGHT), elem (RIGHT));
-#endif
+  at (LEFT) = max (h.at (LEFT), at (LEFT));
+  at (RIGHT) = min (h.at (RIGHT), at (RIGHT));
 }
 
 template<class T>
-Interval_t<T>
-intersect (Interval_t<T> x, Interval_t<T> const &y)
+string
+Interval_t<T>::to_string () const
 {
-  x.intersect (y);
-  return x;
-}
-
-template<class T>
-String
-Interval_t<T>::str () const
-{
-  if (empty_b ())
+  if (is_empty ())
     return "[empty]";
-  String s ("[");
- 
-  return s + T_to_str (elem (LEFT)) + String ("," ) + T_to_str (elem (RIGHT) ) + String ("]" );
+  string s ("[");
+
+  return (s + T_to_string (at (LEFT)) + string (",")
+	  + T_to_string (at (RIGHT)) + string ("]"));
 }
 
 template<class T>
 bool
-Interval_t<T>::elem_b (T r)
+Interval_t<T>::contains (T r) const
 {
-  return r >= elem (LEFT) && r <= elem (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