X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finterval.hh;h=88cd01f89f8342a2d478ce39a6f2b6b4d8812d90;hb=b17d33ae3b2748818e677f4f1aa0ad56fd0d4459;hp=33e7c016304bef0903f2af10c719436faec2c166;hpb=c3805257667c04b22ba780ad9b3f4a37788cf6bd;p=lilypond.git
diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 33e7c01630..88cd01f89f 100644
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -1,7 +1,20 @@
/*
- interval.hh -- part of flowerlib
+ This file is part of LilyPond, the GNU music typesetter.
- (c) 1996--2007 Han-Wen Nienhuys
+ Copyright (C) 1996--2015 Han-Wen Nienhuys
+
+ 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 .
*/
#ifndef INTERVAL_HH
@@ -10,15 +23,16 @@
#include
#include "flower-proto.hh"
+#include "std-string.hh"
#include "drul-array.hh"
/* 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. */
+ At instantiation, the function infinity () has to be defined explicitly. */
template
struct Interval_t : public Drul_array
{
- Drul_array::at;
+ using Drul_array::at;
static T infinity ();
static string T_to_string (T arg);
@@ -55,13 +69,15 @@ struct Interval_t : public Drul_array
at (RIGHT) = max (at (RIGHT), p);
}
T length () const;
+
+ // Returns RIGHT - LEFT, even if the interval is empty.
T delta () const;
void set_empty ();
void set_full ();
- /*
- TODO: strip hungarian suffix.
- */
+ void unite_disjoint (Interval_t h, T padding, Direction d);
+ Interval_t union_disjoint (Interval_t h, T padding, Direction d) const;
+
bool is_empty () const
{
return at (LEFT) > at (RIGHT);
@@ -95,10 +111,10 @@ struct Interval_t : public Drul_array
{
if (!is_empty ())
{
- at (LEFT) *= r;
- at (RIGHT) *= r;
- if (r < T (0))
- swap ();
+ at (LEFT) *= r;
+ at (RIGHT) *= r;
+ if (r < T (0))
+ swap ();
}
return *this;
}
@@ -124,7 +140,7 @@ struct Interval_t : public Drul_array
static bool left_less (Interval_t const &a, Interval_t const &b)
{
- return a[LEFT] < b[RIGHT];
+ return a[LEFT] < b[LEFT];
}
};
@@ -213,7 +229,7 @@ Interval_t::center () const
}
typedef Interval_t Interval;
-typedef Interval_t Slice; // weird name
+typedef Interval_t Slice; // weird name
#endif // INTERVAL_HH