patch::: 1.3.136.jcn3

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

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index aae16381dbef62ed5133b332d49714d8260b5070..849a76e8e89e9c5a8b16ea4a116dac1471998e54 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -8,76 +8,97 @@
 #define INTERVAL_HH
 
 #include <assert.h> 
-#include "fproto.hh"
+#include "flower-proto.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
+/** a T interval.  this represents the closed interval [left,right].
+  No invariants. T must be a totally ordered ring (with division, anyway ..)
+  At instantiation, the function infinity () has to be defined explicitely.
+  
   */
 template<class T>
-struct Interval_t {
-    T left, right;
+struct Interval_t : public Drul_array<T> {
 
-    /* ************** */
+  /* ************** */
     
-    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);
+  static T infinity () ;
+  static String T_to_str (T arg);
+  T center () { return (elem (LEFT) + elem (RIGHT)) / T (2);}
+  void translate (T t)
+    {
+      elem (LEFT) += t;
+      elem (RIGHT) += t;
     }
-    T &max() { return right;}
-    T max()const { return right;}
-    T min()const{ return left; }
-    T &min(){ return left; }
-    /**
-      PRE
-      *this and h are comparable
-      */
-    void unite(Interval_t<T> h);
-    void intersect(Interval_t<T> h);
-
-    T length() const;
-    void set_empty() ;
-    bool empty() const { return left > right; }
-    Interval_t() {
-       set_empty();
-    }
-    Interval_t(T m, T M) {
-       left =m;
-       right = M;
-    }
-    Interval_t<T> &operator += (T r) {
-       left += r;
-       right +=r;
-       return *this;
-    }
-    String str() const;    
-    bool elt_q(T r);
+  
+  /**
+    PRE
+    *this and h are comparable
+    */
+  void unite (Interval_t<T> h);
+  void intersect (Interval_t<T> h);
+
+  T length () const;
+  void set_empty () ;
+  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) : Drul_array<T> (m,M)
+    {}
+  Interval_t<T> &operator -= (T r) {
+    *this += -r;
+    return *this;
+  }
+
+  Interval_t<T> &operator += (T r) {
+    elem (LEFT) += r;
+    elem (RIGHT) +=r;
+    return *this;
+  }
+  Interval_t<T> &operator *= (T r) {
+    if (!empty_b ())
+      {
+       elem (LEFT) *= r;
+       elem (RIGHT) *= r;
+       if (r < T (0)) {
+         T t = elem (LEFT);
+         elem (LEFT) = elem (RIGHT);
+         elem (RIGHT) = t;
+       }
+      }
+    return *this;
+  }
+
+  Real linear_combination (Real x) const {
+    return ((1.0 - x) * Real (elem (LEFT))  + (x + 1.0) * Real (elem (RIGHT))) * 0.5;
+  }
+  String str () const;    
+  void print () const;
+  bool elem_b (T r);
+  void negate () {
+    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&);
+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
@@ -85,41 +106,67 @@ int Interval__compare(const Interval_t<T>&,Interval_t<T> const&);
 
 #include "compare.hh"
 
-template_instantiate_compare(Interval_t<T>&, Interval__compare, template<class T>);
+TEMPLATE_INSTANTIATE_COMPARE (Interval_t<T>&, Interval__compare, template<class T>);
 
 
 template<class T>
 inline Interval_t<T>
-intersection(Interval_t<T> a, Interval_t<T> const&b)
+intersection (Interval_t<T> a, Interval_t<T> const&b)
 {
-    a.intersect(b);
-    return a;
+  a.intersect (b);
+  return a;
     
 }
 
-
 template<class T>
 inline
-Interval_t<T> operator +(T a,Interval_t<T> i )
+Interval_t<T> operator + (T a,Interval_t<T> i)
 {
-    i += a;
-    return i;
+  i += a;
+  return i;
 }
 
 template<class T>
 inline
-Interval_t<T> operator +(Interval_t<T> i,T a ){
-    return a+i;
+Interval_t<T> operator - (Interval_t<T> i, T a)
+{
+  i += -a;
+  return i;
 }
 
-typedef Interval_t<Real> Interval;
+template<class T>
+inline
+Interval_t<T> operator - (T a,Interval_t<T> i)
+{
+  i.negate ();
+  i += a;
+  return i;
+}
 
+template<class T>
+inline
+Interval_t<T> operator + (Interval_t<T> i,T a){
+  return a+i;
+}
 
-#define Interval__instantiate(T) template struct Interval_t<T>;\
-  template  int Interval__compare(const Interval_t<T>&,Interval_t<T> const&)
+template<class T>
+inline
+Interval_t<T> operator * (T a,Interval_t<T> i)
+{
+  i *= a;
+  return i;
+}
 
+template<class T>
+inline
+Interval_t<T> operator * (Interval_t<T> i,T a){
+  return a*i;
+}
 
-#endif // INTERVAL_HH
+// again? see flower-proto.hh
+typedef Interval_t<Real> Interval;
+typedef Interval_t<int> Slice; // weird name
 
 
+#endif // INTERVAL_HH