diff --git a/src/parselmouth/PointProcess.cpp b/src/parselmouth/PointProcess.cpp index 2bc3aa7d..e03db219 100644 --- a/src/parselmouth/PointProcess.cpp +++ b/src/parselmouth/PointProcess.cpp @@ -234,10 +234,10 @@ PRAAT_CLASS_BINDING(PointProcess) { def("get_jitter", [](PointProcess self, JitterMeasurement measurement, std::optional fromTime, std::optional toTime, double periodFloor, double periodCeiling, Positive maximumPeriodFactor) { - auto call = [&](auto f) { return f(self, fromTime.value_or(self->xmin), toTime.value_or(self->xmax), periodFloor, periodCeiling, maximumPeriodFactor); }; + auto call = [&](auto f) { return f(self, fromTime.value_or(self->xmin), toTime.value_or(self->xmax), periodFloor, periodCeiling, maximumPeriodFactor); }; switch (measurement) { case JitterMeasurement::LOCAL: - return call(PointProcess_getJitter_local); + return call(PointProcess_getJitter_local); case JitterMeasurement::LOCAL_ABSOLUTE: return call(PointProcess_getJitter_local_absolute); case JitterMeasurement::RAP: diff --git a/src/parselmouth/Sound.cpp b/src/parselmouth/Sound.cpp index 453f5ad0..2b11cfe2 100644 --- a/src/parselmouth/Sound.cpp +++ b/src/parselmouth/Sound.cpp @@ -56,6 +56,20 @@ OrderedOf referencesToOrderedOf(const Container &container) // TODO type_cast return orderedOf; } +struct Channel { + integer getValue(integer nChannels) { + if (value > nChannels) + throw py::value_error(fmt::format("Channel number ({}) is larger than number of available channels ({}).", value, nChannels)); + return value; + } + integer value; + static const Channel LEFT; + static const Channel RIGHT; +}; + +constexpr Channel Channel::LEFT = Channel{1}; +constexpr Channel Channel::RIGHT = Channel{2}; + } // namespace enum class SoundFileFormat // TODO Nest within Sound? @@ -183,16 +197,35 @@ PRAAT_ENUM_BINDING(ToHarmonicityMethod) { make_implicitly_convertible_from_string(*this); } -enum Channel { - LEFT = 1, - RIGHT = 2 -}; - -PRAAT_ENUM_BINDING(Channel) { - value("LEFT", Channel::LEFT); - value("RIGHT", Channel::RIGHT); - - make_implicitly_convertible_from_string(*this); +CLASS_BINDING(Channel, Channel) +BINDING_CONSTRUCTOR(Channel, "Channel") +BINDING_INIT(Channel) { + def(py::init([](integer value) { + if (value < 0) + throw py::value_error("Channel number should be positive or zero."); + return Channel{value}; + })); + + def(py::init([](std::string value) { + for (auto &c : value) + c = std::toupper(c); + if (value == "LEFT") + return Channel{Channel::LEFT}; + else if (value == "RIGHT") + return Channel{Channel::RIGHT}; + else + throw py::value_error("Channel string can only be 'left' or 'right'."); + })); + + def("__repr__", [](const Channel &self) { return fmt::format("Channel({})", self.value); }); + + def_readonly("value", &Channel::value); + + attr("LEFT") = Channel::LEFT; + attr("RIGHT") = Channel::RIGHT; + + py::implicitly_convertible(); + py::implicitly_convertible(); } PRAAT_CLASS_BINDING(Sound) { @@ -218,7 +251,7 @@ PRAAT_CLASS_BINDING(Sound) { auto nx = values.shape(ndim - 1); auto ny = ndim == 2 ? values.shape(0) : 1; if (ndim == 2 && ny > nx) - PyErr_WarnEx(PyExc_RuntimeWarning, ("Number of channels (" + std::to_string(ny) + ") is greater than number of samples (" + std::to_string(nx) + "); note that the shape of the `values` array is interpreted as (n_channels, n_samples).").c_str(), 1); + PyErr_WarnEx(PyExc_RuntimeWarning, fmt::format("Number of channels ({}) is greater than number of samples ({}); note that the shape of the `values` array is interpreted as (n_channels, n_samples).", ny, nx).c_str(), 1); auto result = Sound_create(ny, startTime, startTime + nx / samplingFrequency, nx, 1.0 / samplingFrequency, startTime + 0.5 / samplingFrequency); @@ -353,12 +386,11 @@ PRAAT_CLASS_BINDING(Sound) { // TODO Minimum & maximum (Vector?) - def("get_nearest_zero_crossing", // TODO Channel is CHANNEL - [](Sound self, double time, long channel) { - if (channel > self->ny) channel = 1; - return Sound_getNearestZeroCrossing (self, time, channel); + def("get_nearest_zero_crossing", + [](Sound self, double time, Channel channel) { + return Sound_getNearestZeroCrossing (self, time, channel.getValue(self->ny)); }, - "time"_a, "channel"_a = 1); + "time"_a, "channel"_a = Channel::LEFT); // TODO Get mean (Vector?) @@ -439,6 +471,7 @@ PRAAT_CLASS_BINDING(Sound) { def("convert_to_stereo", &Sound_convertToStereo); + // NEWMANY_Sound_extractAllChannels def("extract_all_channels", [](Sound self) { std::vector result; @@ -449,25 +482,16 @@ PRAAT_CLASS_BINDING(Sound) { return result; }); - def("extract_channel", // TODO Channel POSITIVE? (Actually CHANNEL; >= 1, but does not always have intended result (e.g., Set value at sample...)) - &Sound_extractChannel, - "channel"_a); - - def("extract_channel", // TODO Channel enum type? - [](Sound self, std::string channel) { - std::transform(channel.begin(), channel.end(), channel.begin(), tolower); - if (channel == "left") - return Sound_extractChannel(self, 1); - if (channel == "right") - return Sound_extractChannel(self, 2); - Melder_throw(U"'channel' can only be 'left' or 'right'"); // TODO Melder_throw or throw PraatError ? + def("extract_channel", + [](Sound self, Channel channel) { + return Sound_extractChannel(self, channel.value); // Will check the range of the channel itself. }); def("extract_left_channel", - [](Sound self) { return Sound_extractChannel(self, 1); }); + [](Sound self) { return Sound_extractChannel(self, Channel::LEFT.value); }); def("extract_right_channel", - [](Sound self) { return Sound_extractChannel(self, 2); }); + [](Sound self) { return Sound_extractChannel(self, Channel::RIGHT.value); }); def("extract_part", // TODO Something for std::optional for from and to in Sounds? [](Sound self, std::optional fromTime, std::optional toTime, kSound_windowShape windowShape, Positive relativeWidth, bool preserveTimes) { return Sound_extractPart(self, fromTime.value_or(self->xmin), toTime.value_or(self->xmax), windowShape, relativeWidth, preserveTimes); }, @@ -627,55 +651,39 @@ PRAAT_CLASS_BINDING(Sound) { "number_of_coefficients"_a = 12, "window_length"_a = 0.015, "time_step"_a = 0.005, "firstFilterFreqency"_a = 100.0, "distance_between_filters"_a = 100.0, "maximum_frequency"_a = std::nullopt); // NEW_Sound_to_PointProcess_extrema - def( - "to_point_process_extrema", - [](Sound self, Channel channel, bool includeMaxima, bool includeMinima, - kVector_peakInterpolation peakInterpolationType) { - int ch = static_cast(channel); - return Sound_to_PointProcess_extrema(self, ch > self->ny ? 1 : ch, - peakInterpolationType, - includeMaxima, includeMinima); + def("to_point_process_extrema", + [](Sound self, Channel channel, bool includeMaxima, bool includeMinima, kVector_peakInterpolation peakInterpolationType) { + return Sound_to_PointProcess_extrema(self, channel.getValue(self->ny), peakInterpolationType, includeMaxima, includeMinima); }, "channel"_a = Channel::LEFT, "include_maxima"_a = true, "include_minima"_a = false, "interpolation"_a = kVector_peakInterpolation::SINC70, TO_POINT_PROCESS_EXTREMA_DOCSTRING); // NEW_Sound_to_PointProcess_periodic_cc - def( - "to_point_process_periodic", + def("to_point_process_periodic", [](Sound self, float minimumPitch, float maximumPitch) { if (maximumPitch <= minimumPitch) - Melder_throw( - U"Your maximum pitch should be greater than your minimum pitch."); - return Sound_to_PointProcess_periodic_cc(self, minimumPitch, - maximumPitch); + Melder_throw(U"Your maximum pitch should be greater than your minimum pitch."); + return Sound_to_PointProcess_periodic_cc(self, minimumPitch, maximumPitch); }, "minimum_pitch"_a = 75.0, "maximum_pitch"_a = 600.0, TO_POINT_PROCESS_PERIODIC_DOCSTRING); // NEW_Sound_to_PointProcess_periodic_peaks - def( - "to_point_process_periodic_peaks", - [](Sound self, float minimumPitch, float maximumPitch, bool includeMaxima, - bool includeMinima) { + def("to_point_process_periodic_peaks", + [](Sound self, float minimumPitch, float maximumPitch, bool includeMaxima, bool includeMinima) { if (maximumPitch <= minimumPitch) - Melder_throw( - U"Your maximum pitch should be greater than your minimum pitch."); - return Sound_to_PointProcess_periodic_peaks( - self, minimumPitch, maximumPitch, includeMaxima, includeMinima); + Melder_throw(U"Your maximum pitch should be greater than your minimum pitch."); + return Sound_to_PointProcess_periodic_peaks(self, minimumPitch, maximumPitch, includeMaxima, includeMinima); }, "minimum_pitch"_a = 75.0, "maximum_pitch"_a = 600.0, "include_maxima"_a = true, "include_minima"_a = false, TO_POINT_PROCESS_PERIODIC_PEAKS_DOCSTRING); // NEW_Sound_to_PointProcess_zeroes - def( - "to_point_process_zeros", - [](Sound self, Channel ch, bool includeRaisers, bool includeFallers) { - int channel = static_cast(ch); - return Sound_to_PointProcess_zeroes(self, - channel > self->ny ? 1 : channel, - includeRaisers, includeFallers); + def("to_point_process_zeros", + [](Sound self, Channel channel, bool includeRaisers, bool includeFallers) { + return Sound_to_PointProcess_zeroes(self, channel.getValue(self->ny), includeRaisers, includeFallers); }, "channel"_a = Channel::LEFT, "include_raisers"_a = true, "include_fallers"_a = false, TO_POINT_PROCESS_ZEROS_DOCSTRING); diff --git a/tests/test_sound.py b/tests/test_sound.py index 7a096fcc..cd9efcad 100644 --- a/tests/test_sound.py +++ b/tests/test_sound.py @@ -52,7 +52,7 @@ def test_from_numpy_array_stereo(sampling_frequency): sound = parselmouth.Sound(np.vstack((sine_values, cosine_values))[::-1,1::3], sampling_frequency=sampling_frequency) assert np.all(sound.values == [cosine_values[1::3], sine_values[1::3]]) - with pytest.warns(RuntimeWarning, match=r'Number of channels \([0-9]+\) is greater than number of samples \([0-9]+\)'): + with pytest.warns(RuntimeWarning, match=r"Number of channels \([0-9]+\) is greater than number of samples \([0-9]+\)"): parselmouth.Sound(np.vstack((sine_values, cosine_values)).T, sampling_frequency=sampling_frequency) @@ -62,3 +62,27 @@ def test_from_scalar(sampling_frequency): with pytest.raises(ValueError, match="Cannot create Sound from a single 0-dimensional number"): parselmouth.Sound(3.14159, sampling_frequency=sampling_frequency) + +@pytest.mark.filterwarnings('ignore:Number of channels .* is greater than number of samples') +def test_channel_type(): + n_channels = 10 + sound = parselmouth.Sound(np.arange(n_channels)[:,None]) + assert sound.n_channels == n_channels + for i in range(n_channels): + assert np.array_equal(sound.extract_channel(parselmouth.Sound.Channel(i + 1)).values, [[i]]) + assert np.array_equal(sound.extract_channel(i + 1).values, [[i]]) + with pytest.raises(TypeError, match=r"extract_channel\(\): incompatible function arguments"): + sound.extract_channel(-1) + assert np.isnan(sound.get_nearest_zero_crossing(0, channel=1)) + with pytest.raises(ValueError, match=r"Channel number (.*) is larger than number of available channels (.*)\."): + assert sound.get_nearest_zero_crossing(0, channel=n_channels + 1) + assert np.array_equal(sound.extract_channel('LEFT').values, [[0]]) + assert np.array_equal(sound.extract_channel('right').values, [[1]]) + with pytest.raises(TypeError, match=r"extract_channel\(\): incompatible function arguments"): + sound.extract_channel('MIDDLE') + + assert parselmouth.Sound.Channel(42).value == 42 + with pytest.raises(ValueError, match=r"Channel number should be positive or zero\."): + parselmouth.Sound.Channel(-1) + with pytest.raises(ValueError, match=r"Channel string can only be 'left' or 'right'\."): + parselmouth.Sound.Channel('MIDDLE, I said')