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

diff --git a/flower/interval.cc b/flower/interval.cc
index f176c7486f..a73da9e788 100644
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -1,83 +1,53 @@
-#include <assert.h> 
-#include <math.h>
-#include "interval.hh"
-#include "string.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-const Real INFTY = HUGE;
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-void
-Interval::set_empty() {
-    min = INFTY;
-    max = -INFTY;
-}
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-Real
-Interval::length() const {
-    assert(max >= min);
-    return max-min;
-}
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-void
-Interval::unite(Interval h)
-{
-    compare(h, *this );
-    if (h.min<min)
-	min = h.min;
-    if (h.max>max)
-	max = h.max;
-}
+#include "interval.hh"
 
-void
-Interval::intersect(Interval h)
+#include "interval.tcc"
+
+template<>
+Real
+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)
-{
-    x.intersect(y);
-    return x;
-}
-    
-String
-Interval::str() const
-{
-    if (empty())
-	return "[empty]";
-    String s("[");
- 
-    return s + min + "," + max +"]";
-}
-bool
-Interval::elt_q(Real r)
+template<>
+string
+Interval_t<int>::T_to_string (int i)
 {
-    return r >= min && r <= max;
+  return ::to_string (i);
 }
+
+template INTERVAL__INSTANTIATE (int);
+template INTERVAL__INSTANTIATE (Real);