X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finterval.tcc;h=72be6e81e92161984a74cfb6128902bb3d2ade31;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=6e7b0b1279c228982edacbf11eee9775bc07dce6;hpb=01ddcb81463d7a68530971100469d3e2baf8c94b;p=lilypond.git

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 6e7b0b1279..72be6e81e9 100644
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -1,106 +1,165 @@
-#include <assert.h> 
-#include <math.h>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  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.
+
+  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.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef INTERVAL_TCC
+#define INTERVAL_TCC
+
+#include <cassert>
+
 #include "interval.hh"
-#include "string.hh"
+#include "std-string.hh"
 
+// MacOS 10.3 problems:
+// #include <cmath>
+using namespace std;
 
 template<class T>
 int
-_Interval__compare(const Interval_t<T>&a,Interval_t<T> const&b)
+_Interval__compare (const Interval_t<T> &a, Interval_t<T> const &b)
 {
-    if (a.left == b.left && a.right == b.right)
-	return 0;
-    
-    if (a.left <= b.left && a.right >= b.right)
-	return 1;
+  if (a.at (LEFT) == b.at (LEFT) && a.at (RIGHT) == b.at (RIGHT))
+    return 0;
+
+  if (a.at (LEFT) <= b.at (LEFT) && a.at (RIGHT) >= b.at (RIGHT))
+    return 1;
 
-    if (a.left >= b.left && a.right <= b.right)
-	return -1;
+  if (a.at (LEFT) >= b.at (LEFT) && a.at (RIGHT) <= b.at (RIGHT))
+    return -1;
 
-    return -2;
+  return -2;
 }
 
+template<class T>
+bool
+Interval_t<T>::superset (Interval_t<T> const &a) const
+{
+  int c_i = _Interval__compare (*this, a);
+  if (c_i == -2)
+    return false;
+  return c_i >= 0;
+}
 
 template<class T>
 int
-Interval__compare(const Interval_t<T>&a,Interval_t<T> const&b)
+Interval__compare (Interval_t<T> const &a, Interval_t<T> const &b)
 {
-    int i = _Interval__compare(a,b);
-    if (i < -1)
-	assert(false);
-    return i;
+  int i = _Interval__compare (a, b);
+  if (i < -1)
+    assert (false);
+  return i;
 }
 
-#ifdef AIX
-const Real INFTY = 1e8;	// ARGh. AIX sucks
-#else
-const Real INFTY = HUGE_VAL;
-#endif
+template<class T>
+void
+Interval_t<T>::set_empty ()
+{
+  at (LEFT) = (T) infinity ();
+  at (RIGHT) = (T) - infinity ();
+}
 
 template<class T>
 void
-Interval_t<T>::set_empty()
+Interval_t<T>::set_full ()
 {
-    left = INFTY;
-    right = -INFTY;
+  at (LEFT) = (T) - infinity ();
+  at (RIGHT) = (T) infinity ();
 }
 
 template<class T>
 T
-Interval_t<T>::length() const {
-    assert(right >= left);
-    return right-left;
+Interval_t<T>::length () const
+{
+  if (at (RIGHT) <= at (LEFT))
+    return 0;
+  else
+    return at (RIGHT) - at (LEFT);
 }
 
 template<class T>
-void
-Interval_t<T>::unite(Interval_t<T> h)
+T
+Interval_t<T>::delta () const
 {
-    if (h.left<left)
-	left = h.left;
-    if (h.right>right)
-	right = h.right;
+  return at (RIGHT) - at (LEFT);
 }
 
-/**
-  smallest Interval which includes *this and #h#
- */
+/* smallest Interval which includes *this and #h#  */
+template<class T>
+void
+Interval_t<T>::unite (Interval_t<T> h)
+{
+  at (LEFT) = min (h.at (LEFT), at (LEFT));
+  at (RIGHT) = max (h.at (RIGHT), at (RIGHT));
+}
 
+/* Unites h and this interval, but in such a way
+   that h will lie in a particular direction from this
+   interval, with a minimum amount of space in between.
+   (That is, h will be translated before we unite, if
+   that is necessary to prevent overlap. */
 template<class T>
 void
-Interval_t<T>::intersect(Interval_t<T> h)
+Interval_t<T>::unite_disjoint (Interval_t<T> h, T padding, Direction d)
 {
-#if defined (__GNUG__) && ! defined (__STRICT_ANSI__)
-    left = h.left >? left;
-    right = h.right <?right;
-#else
-    left = max(h.left, left);
-    right = min(h.right, right);
-#endif
+  T dir = d;
+  T translation = dir * (at (d) + dir * padding - h.at (-d));
+  if (translation > (T) 0)
+    h.translate (translation);
+  unite (h);
 }
 
 template<class T>
 Interval_t<T>
-intersect(Interval_t<T> x, Interval_t<T> const &y)
+Interval_t<T>::union_disjoint (Interval_t<T> h, T padding, Direction d) const
 {
-    x.intersect(y);
-    return x;
+  Interval_t<T> iv = *this;
+  iv.unite_disjoint (h, padding, d);
+  return iv;
 }
 
 template<class T>
-String
-Interval_t<T>::str() const
+void
+Interval_t<T>::intersect (Interval_t<T> h)
 {
-    if (empty())
-	return "[empty]";
-    String s("[");
- 
-    return s + left + "," + right +"]";
+  at (LEFT) = max (h.at (LEFT), at (LEFT));
+  at (RIGHT) = min (h.at (RIGHT), at (RIGHT));
+}
+
+template<class T>
+string
+Interval_t<T>::to_string () const
+{
+  if (is_empty ())
+    return "[empty]";
+  string s ("[");
+
+  return (s + T_to_string (at (LEFT)) + string (",")
+          + T_to_string (at (RIGHT)) + string ("]"));
 }
 
 template<class T>
 bool
-Interval_t<T>::elt_q(T r)
+Interval_t<T>::contains (T r) const
 {
-    return r >= left && r <= right;
+  return r >= at (LEFT) && r <= at (RIGHT);
 }
+
+#define INTERVAL__INSTANTIATE(T) struct Interval_t<T>;                  \
+  template int Interval__compare (const Interval_t<T> &, Interval_t<T> const &)
+
+#endif // INTERVAL_TCC