X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finterval.cc;h=ffcf4782b52d5726f3684d8b434f0b61a1253f5b;hb=9c7b1ba153a001257c305d758cb6f16653e6c51a;hp=f176c7486fe5738ab5150ac46f22cdfab5b1ae4c;hpb=afa9eb0922477ed70c182b3fc023a3baedb5c6f0;p=lilypond.git

diff --git a/flower/interval.cc b/flower/interval.cc
index f176c7486f..ffcf4782b5 100644
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -1,83 +1,41 @@
-#include <assert.h> 
-#include <math.h>
-#include "interval.hh"
-#include "string.hh"
+/*
+  interval.cc -- instantiate Interval_t<Real>
 
+  source file of the Flower Library
 
-const Real INFTY = HUGE;
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
-void
-Interval::set_empty() {
-    min = INFTY;
-    max = -INFTY;
-}
 
-Real
-Interval::length() const {
-    assert(max >= min);
-    return max-min;
-}
+#include "interval.hh"
+#include "real.hh"
+#include "interval.tcc"
 
-void
-Interval::unite(Interval h)
+Real
+Interval_t<Real>::infinity () 
 {
-    compare(h, *this );
-    if (h.min<min)
-	min = h.min;
-    if (h.max>max)
-	max = h.max;
+  return HUGE_VAL;
 }
 
-void
-Interval::intersect(Interval h)
+String
+Interval_t<Real>::T_to_str (Real r)
 {
-    min = MAX(h.min, min);
-    max = MIN(h.max, max);
+  return to_str (r);
 }
 
-Interval
-intersection(Interval a, Interval const&b)
-{
-    a.intersect(b);
-    return a;
-    
-}
 
 int
-Interval::compare(const Interval&a,Interval const&b)
+Interval_t<int>::infinity () 
 {
-    if (a.min == b.min && a.max == b.max)
-	return 0;
-    
-    if (a.min <= b.min && a.max >= b.max)
-	return 1;
-
-    if (a.min >= b.min && a.max <= b.max)
-	return -1;
-
-    assert(false);		// not comparable
-
-    return 0;
+  return INT_MAX;
 }
 
-Interval
-intersect(Interval x, Interval const &y)
-{
-    x.intersect(y);
-    return x;
-}
-    
 String
-Interval::str() const
+Interval_t<int>::T_to_str (int i)
 {
-    if (empty())
-	return "[empty]";
-    String s("[");
- 
-    return s + min + "," + max +"]";
-}
-bool
-Interval::elt_q(Real r)
-{
-    return r >= min && r <= max;
+  return to_str (i);
 }
+
+template INTERVAL__INSTANTIATE (int);
+template INTERVAL__INSTANTIATE (Real);
+