Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / flower / interval.cc

diff --git a/flower/interval.cc b/flower/interval.cc
index 6fac1f55dca0d754382282d600e35d25aab5309a..64f431f4f5589df47505e47652d20d3909265a14 100644 (file)
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -1,78 +1,42 @@
-#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--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-void
-Interval::set_empty() {
-    min = INFTY;
-    max = -INFTY;
-}
+#include "interval.hh"
+
+#include "interval.tcc"
 
+template<>
 Real
-Interval::length() const {
-    assert(max >= min);
-    return max-min;
-}
-void
-Interval::unite(Interval h)
-{
-    if (h.min<min)
-       min = h.min;
-    if (h.max>max)
-       max = h.max;
-}
-void
-Interval::intersect(Interval h)
+Interval_t<Real>::infinity ()
 {
-    min = MAX(h.min, min);
-    max = MIN(h.max, max);
+  return HUGE_VAL;
 }
-Interval
-intersection(Interval a, Interval const&b)
+
+template<>
+string
+Interval_t<Real>::T_to_string (Real r)
 {
-    a.intersect(b);
-    return a;
-    
+  return ::to_string (r);
 }
+
+template<>
 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)
+template<>
+string
+Interval_t<int>::T_to_string (int i)
 {
-    x.intersect(y);
-    return x;
+  return ::to_string (i);
 }
-    
 
-Interval::operator String() const
-{
-    if (empty())
-       return "[empty]";
-    String s("[");
- 
-    return s + min + "," + max +"]";
-}
-bool
-Interval::elt_q(Real r)
-{
-    return r >= min && r <= max;
-}
+template INTERVAL__INSTANTIATE (int);
+template INTERVAL__INSTANTIATE (Real);