Merge 2b5dcf0 into 78bd08c

albertms10 · Mar 29, 2024 · 10d6a43 · 10d6a43
2 parents 78bd08c + 2b5dcf0
commit 10d6a43
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 26 deletions.
diff --git 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/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
@@ -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));
       });
     });
 
@@ -119,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),
             },
           );
         },