From c3b893f56539ac88a8f2219845dad5fd04b72deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Ma=C3=B1osa?= <26429103+albertms10@users.noreply.github.com> Date: Fri, 29 Mar 2024 23:20:42 +0100 Subject: [PATCH 1/2] =?UTF-8?q?test(frequency):=20=F0=9F=A7=AA=20add=20tes?= =?UTF-8?q?t=20case=20for=20chained=20`closestPitch`=20with=20`temperature?= =?UTF-8?q?`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Albert Mañosa <26429103+albertms10@users.noreply.github.com> --- test/src/note/closest_pitch_test.dart | 5 +++-- test/src/note/frequency_test.dart | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/test/src/note/closest_pitch_test.dart b/test/src/note/closest_pitch_test.dart index 4793c8d8..a8207a06 100644 --- a/test/src/note/closest_pitch_test.dart +++ b/test/src/note/closest_pitch_test.dart @@ -61,10 +61,11 @@ void main() { const frequency = Frequency(415); expect(frequency.closestPitch().frequency(), frequency); + const temperature = Celsius(18); expect( frequency - .closestPitch(temperature: const Celsius(18)) - .frequency(temperature: const Celsius(18)), + .closestPitch(temperature: temperature) + .frequency(temperature: temperature), frequency, ); }); diff --git a/test/src/note/frequency_test.dart b/test/src/note/frequency_test.dart index fff54a9d..62461cf0 100644 --- a/test/src/note/frequency_test.dart +++ b/test/src/note/frequency_test.dart @@ -76,9 +76,14 @@ void main() { test('returns the same Frequency after Pitch.frequency()', () { final pitch = Note.a.inOctave(5); - final closestPitch = pitch.frequency().closestPitch(); - expect(closestPitch.pitch, pitch); - expect(closestPitch.cents, const Cent(0)); + var closestPitch = pitch.frequency().closestPitch(); + expect(closestPitch, pitch + const Cent(0)); + + const temperature = Celsius(18); + closestPitch = pitch + .frequency(temperature: temperature) + .closestPitch(temperature: temperature); + expect(closestPitch, pitch + const Cent(0)); }); }); From 2b5dcf09530c487db2373b384797e26aac38a71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Ma=C3=B1osa?= <26429103+albertms10@users.noreply.github.com> Date: Fri, 29 Mar 2024 23:21:23 +0100 Subject: [PATCH 2/2] =?UTF-8?q?refactor(frequency):=20=E2=99=BB=EF=B8=8F?= =?UTF-8?q?=20use=20`const`=20Set=20collections=20where=20possible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Albert Mañosa <26429103+albertms10@users.noreply.github.com> --- lib/src/note/frequency.dart | 2 +- test/src/note/frequency_test.dart | 40 +++++++++++++++---------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/src/note/frequency.dart b/lib/src/note/frequency.dart index 9266e2b3..fcee64d1 100644 --- a/lib/src/note/frequency.dart +++ b/lib/src/note/frequency.dart @@ -110,7 +110,7 @@ extension type const Frequency._(num hertz) implements num { /// Example: /// ```dart /// Note.a.inOctave(3).frequency().harmonics(upToIndex: 2) - /// == {const Frequency(220), const Frequency(440), const Frequency(660)} + /// == const {Frequency(220), Frequency(440), Frequency(660)} /// /// Note.a.inOctave(5).frequency().harmonics(upToIndex: -2) /// == {const Frequency(880), const Frequency(440), const Frequency(293.33)} diff --git a/test/src/note/frequency_test.dart b/test/src/note/frequency_test.dart index 62461cf0..d77b0954 100644 --- a/test/src/note/frequency_test.dart +++ b/test/src/note/frequency_test.dart @@ -124,35 +124,35 @@ void main() { ); expect( const Frequency(400).harmonics(upToIndex: -1), - {const Frequency(400), const Frequency(200)}, + const {Frequency(400), Frequency(200)}, ); expect( const Frequency(220).harmonics(upToIndex: 0), - {const Frequency(220)}, + const {Frequency(220)}, ); expect( const Frequency(110).harmonics(upToIndex: 1), - {const Frequency(110), const Frequency(220)}, + const {Frequency(110), Frequency(220)}, ); expect( const Frequency(32).harmonics(upToIndex: 15), - { - const Frequency(32), - const Frequency(64), - const Frequency(96), - const Frequency(128), - const Frequency(160), - const Frequency(192), - const Frequency(224), - const Frequency(256), - const Frequency(288), - const Frequency(320), - const Frequency(352), - const Frequency(384), - const Frequency(416), - const Frequency(448), - const Frequency(480), - const Frequency(512), + const { + Frequency(32), + Frequency(64), + Frequency(96), + Frequency(128), + Frequency(160), + Frequency(192), + Frequency(224), + Frequency(256), + Frequency(288), + Frequency(320), + Frequency(352), + Frequency(384), + Frequency(416), + Frequency(448), + Frequency(480), + Frequency(512), }, ); },