/*
- pitch-interval.cc -- implement Pitch_interval
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2004--2007 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/>.
*/
#include "pitch-interval.hh"
Pitch_interval::Pitch_interval ()
{
- at (LEFT) = Pitch (100, 0, 0);
- at (RIGHT) = Pitch (-100, 0, 0);
+ at (LEFT) = Pitch (100, 0);
+ at (RIGHT) = Pitch (-100, 0);
}
bool
return at (LEFT) > at (RIGHT);
}
-Direction
+Drul_array<bool>
Pitch_interval::add_point (Pitch p)
{
- if (is_empty())
- {
- at (LEFT) = at (RIGHT) = p;
- return CENTER;
- }
- else if (at (LEFT).tone_pitch () > p.tone_pitch ())
+ Drul_array<bool> expansions (false, false);
+ if (at (LEFT).tone_pitch () > p.tone_pitch ())
{
at (LEFT) = p;
- return LEFT;
+ expansions [LEFT] = true;
}
- else if (at (RIGHT).tone_pitch () < p.tone_pitch ())
+ if (at (RIGHT).tone_pitch () < p.tone_pitch ())
{
at (RIGHT) = p;
- return RIGHT;
+ expansions [RIGHT] = true;
}
- else
- return CENTER;
+ return expansions;
}
-
Pitch_lexicographic_interval::Pitch_lexicographic_interval (Pitch p1, Pitch p2)
{
at (LEFT) = p1;
Pitch_lexicographic_interval::Pitch_lexicographic_interval ()
{
- at (LEFT) = Pitch (100, 0, 0);
- at (RIGHT) = Pitch (-100, 0, 0);
+ at (LEFT) = Pitch (100, 0);
+ at (RIGHT) = Pitch (-100, 0);
}
bool
return at (LEFT) > at (RIGHT);
}
-Direction
+Drul_array<bool>
Pitch_lexicographic_interval::add_point (Pitch p)
{
- if (is_empty())
- {
- at (LEFT) = at (RIGHT) = p;
- return CENTER;
- }
- else if (at (LEFT) > p)
+ Drul_array<bool> expansions (false, false);
+ if (at (LEFT) > p)
{
at (LEFT) = p;
- return LEFT;
+ expansions [LEFT] = true;
}
- else if (at (RIGHT) < p)
+ if (at (RIGHT) < p)
{
at (RIGHT) = p;
- return RIGHT;
+ expansions [RIGHT] = true;
}
- else
- return CENTER;
+ return expansions;
}