release: 1.1.39

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

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 7a868a31ab9b92b8eac30849c01eae4c092613ac..e02a7495a8fbeb8f4e794e545d4c10a176e812a7 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -10,7 +10,7 @@
 #include <assert.h> 
 #include "fproto.hh"
 #include "real.hh"
-
+#include "drul-array.hh"
 
 /** a T interval.  this represents the closed interval [left,right].
   No invariants. T must be a totally ordered ring (with division, anyway ..)
@@ -18,38 +18,19 @@
   
   */
 template<class T>
-struct Interval_t {
-  T left, right;
+struct Interval_t : public Drul_array<T> {
 
   /* ************** */
     
   static T infinity() ;
   static String T_to_str (T arg);
-    
-  T center() { return (left + right) / T(2);}
-  void translate (T t) {
-    left += t;
-    right += t;
-  }
-  T& idx (int j) {
-    if (j==-1)
-      return left;
-    else if (j==1)
-      return right;
-    else
-      assert (false);
-    return left;               
-  }
-  T& operator[](int j) {
-    return idx (j);
-  }
-  T operator[](int j) const {
-    return ((Interval_t<T> *)this)->idx (j);
-  }
-  T &max() { return right;}
-  T max() const { return right;}
-  T min() const{ return left; }
-  T &min(){ return left; }
+  T center() { return (elem (LEFT) + elem (RIGHT)) / T(2);}
+  void translate (T t)
+    {
+      elem (LEFT) += t;
+      elem (RIGHT) += t;
+    }
+  
   /**
     PRE
     *this and h are comparable
@@ -59,48 +40,59 @@ struct Interval_t {
 
   T length() const;
   void set_empty() ;
-  bool empty_b() const { return left > right; }
+  bool empty_b() const { return elem (LEFT) > elem (RIGHT); }
   bool contains_b (Interval_t<T> const&) const;
   Interval_t() {
     set_empty();
   }
-  Interval_t (T m, T M) {
-    left =m;
-    right = M;
+  Interval_t (T m, T M) : Drul_array<T> (m,M)
+    {}
+  Interval_t<T> &operator -= (T r) {
+    *this += -r;
+    return *this;
   }
+
   Interval_t<T> &operator += (T r) {
-    left += r;
-    right +=r;
+    elem (LEFT) += r;
+    elem (RIGHT) +=r;
     return *this;
   }
   Interval_t<T> &operator *=(T r) {
-    left *= r;
-    right *= r;
+    elem (LEFT) *= r;
+    elem (RIGHT) *= r;
     if (r < T(0)) {
-      T t = left;
-      left = right;
-      right = t;
+      T t = elem (LEFT);
+      elem (LEFT) = elem (RIGHT);
+      elem (RIGHT) = t;
     }
     return *this;
   }
   String str() const;    
   void print () const;
-  bool elt_b (T r);
+  bool elem_b (T r);
   void negate () {
-    T r = -left;
-    T l = -right;
-    left = l;
-    right =r;
+    T r = -elem (LEFT);
+    T l = -elem (RIGHT);
+    elem (LEFT) = l;
+    elem (RIGHT) =r;
   }
 };
 
 
 /**
-  inclusion ordering. Crash if not comparable.
+  inclusion ordering. Crash if not  comparable.
   */
 template<class T>
 int Interval__compare (const Interval_t<T>&,Interval_t<T> const&);
 
+/**
+   Inclusion ordering.  return -2 if not comparable
+ */
+template<class T>
+int
+_Interval__compare (const Interval_t<T>&a,Interval_t<T> const&b);
+
+
 /*
   INLINE
  */
@@ -164,12 +156,10 @@ Interval_t<T> operator *(Interval_t<T> i,T a){
   return a*i;
 }
 
+// again? see fproto.hh
 typedef Interval_t<Real> Interval;
-
-
+typedef Interval_t<int> Slice; // weird name
 
 
 #endif // INTERVAL_HH
 
-
-