public:
Pitch_interval ();
Pitch_interval (Pitch, Pitch);
- void add_point (Pitch);
+ Direction add_point (Pitch);
bool is_empty () const;
};
public:
Pitch_lexicographic_interval ();
Pitch_lexicographic_interval (Pitch, Pitch);
- void add_point (Pitch);
+ Direction add_point (Pitch);
bool is_empty () const;
};
return at (LEFT) > at (RIGHT);
}
-void
+Direction
Pitch_interval::add_point (Pitch p)
{
if (at (LEFT).tone_pitch () > p.tone_pitch ())
- at (LEFT) = p;
- if (at (RIGHT).tone_pitch () < p.tone_pitch ())
- at (RIGHT) = p;
+ {
+ at (LEFT) = p;
+ return LEFT;
+ }
+ else if (at (RIGHT).tone_pitch () < p.tone_pitch ())
+ {
+ at (RIGHT) = p;
+ return RIGHT;
+ }
+ else
+ return CENTER;
}
return at (LEFT) > at (RIGHT);
}
-void
+Direction
Pitch_lexicographic_interval::add_point (Pitch p)
{
if (at (LEFT) > p)
- at (LEFT) = p;
- if (at (RIGHT) < p)
- at (RIGHT) = p;
+ {
+ at (LEFT) = p;
+ return LEFT;
+ }
+ else if (at (RIGHT) < p)
+ {
+ at (RIGHT) = p;
+ return RIGHT;
+ }
+ else
+ return CENTER;
}