commit 7ec9041923924eaec172c9e67db4e39337ac8d0b
parent 5b9f90e04724680bd408682bcac1ae52b5bb35f4
Author: gstraube <gstraube@mailbox.org>
Date: Sun, 20 Aug 2017 18:20:30 +0200
Change displayed note name
Diffstat:
5 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/app/src/androidTest/java/com/github/cythara/TunerViewTest.java b/app/src/androidTest/java/com/github/cythara/TunerViewTest.java
@@ -40,7 +40,7 @@ public class TunerViewTest {
@Test
public void exactly_matching_pitch_is_displayed() throws IOException {
- isDisplayedCorrectly(R.drawable.exact, new PitchDifference(Note.E4, 0));
+ isDisplayedCorrectly(R.drawable.exact, new PitchDifference(Note.E1, 0));
}
@Test
@@ -61,7 +61,7 @@ public class TunerViewTest {
for (Integer deviation : deviationToReferenceId.keySet()) {
isDisplayedCorrectly(deviationToReferenceId.get(deviation),
- new PitchDifference(Note.B3, deviation));
+ new PitchDifference(Note.B2, deviation));
}
}
@@ -78,16 +78,16 @@ public class TunerViewTest {
for (Double deviation : deviationToReferenceId.keySet()) {
isDisplayedCorrectly(deviationToReferenceId.get(deviation),
- new PitchDifference(Note.B3, deviation));
+ new PitchDifference(Note.B2, deviation));
}
}
@Test
public void values_outside_of_boundaries_are_not_displayed() throws IOException {
isDisplayedCorrectly(R.drawable.blank,
- new PitchDifference(Note.D3, 30.5));
+ new PitchDifference(Note.D4, 30.5));
isDisplayedCorrectly(R.drawable.blank,
- new PitchDifference(Note.D3, -30.5));
+ new PitchDifference(Note.D4, -30.5));
}
public void isDisplayedCorrectly(int referenceId, PitchDifference pitchDifference)
diff --git a/app/src/main/java/com/github/cythara/Note.java b/app/src/main/java/com/github/cythara/Note.java
@@ -2,12 +2,12 @@ package com.github.cythara;
enum Note {
- E2(82.41f),
- A2(110f),
- D3(146.83f),
+ E6(82.41f),
+ A5(110f),
+ D4(146.83f),
G3(196f),
- B3(246.94f),
- E4(329.63f);
+ B2(246.94f),
+ E1(329.63f);
private final float frequency;
diff --git a/app/src/main/java/com/github/cythara/PitchComparator.java b/app/src/main/java/com/github/cythara/PitchComparator.java
@@ -15,7 +15,7 @@ class PitchComparator {
});
double minCentDifference = Float.POSITIVE_INFINITY;
- Note closest = Note.E4;
+ Note closest = Note.E1;
for (Note note : notes) {
double centDifference = 1200d * log2(pitch / note.getFrequency());
diff --git a/app/src/test/java/com/github/cythara/PitchComparatorTest.java b/app/src/test/java/com/github/cythara/PitchComparatorTest.java
@@ -15,10 +15,10 @@ public class PitchComparatorTest {
@Test
public void retrieveNote() throws Exception {
Map<Float, PitchDifference> expectations = new HashMap<>();
- expectations.put(20f, new PitchDifference(E2, -2451.3832933619105));
- expectations.put(500f, new PitchDifference(E4, 721.296654095616));
+ expectations.put(20f, new PitchDifference(E6, -2451.3832933619105));
+ expectations.put(500f, new PitchDifference(E1, 721.296654095616));
expectations.put(197.67f, new PitchDifference(G3, 14.688333908767358));
- expectations.put(128.415f, new PitchDifference(D3, -231.99964198777823));
+ expectations.put(128.415f, new PitchDifference(D4, -231.99964198777823));
for (Float pitch : expectations.keySet()) {
PitchDifference actual = PitchComparator.retrieveNote(pitch);
diff --git a/app/src/test/java/com/github/cythara/SamplerTest.java b/app/src/test/java/com/github/cythara/SamplerTest.java
@@ -18,18 +18,18 @@ public class SamplerTest {
public void the_average_difference_is_calculated_correctly() {
List<PitchDifference> samples = new ArrayList<>();
- samples.add(new PitchDifference(E2, 2.46D));
- samples.add(new PitchDifference(E2, -10.3D));
- samples.add(new PitchDifference(E2, 5.71D));
- samples.add(new PitchDifference(E2, 12.532D));
- samples.add(new PitchDifference(E2, -0.414D));
+ samples.add(new PitchDifference(E6, 2.46D));
+ samples.add(new PitchDifference(E6, -10.3D));
+ samples.add(new PitchDifference(E6, 5.71D));
+ samples.add(new PitchDifference(E6, 12.532D));
+ samples.add(new PitchDifference(E6, -0.414D));
PitchDifference pitchDifference = calculateAverageDifference(samples);
double average = (2.46D - 10.3D + 5.71D + 12.532D - 0.414D) / 5D;
assertNotNull(pitchDifference);
- assertThat(pitchDifference.closest, is(E2));
+ assertThat(pitchDifference.closest, is(E6));
assertThat(pitchDifference.deviation, closeTo(average, 0.001));
}
@@ -37,17 +37,17 @@ public class SamplerTest {
public void samples_are_filtered_correctly() {
List<PitchDifference> samples = new ArrayList<>();
- samples.add(new PitchDifference(E2, 2D));
- samples.add(new PitchDifference(E2, 2D));
- samples.add(new PitchDifference(B3, 3D));
- samples.add(new PitchDifference(E2, 2D));
+ samples.add(new PitchDifference(E6, 2D));
+ samples.add(new PitchDifference(E6, 2D));
+ samples.add(new PitchDifference(B2, 3D));
+ samples.add(new PitchDifference(E6, 2D));
samples.add(new PitchDifference(Note.G3, 4D));
- samples.add(new PitchDifference(B3, 3D));
+ samples.add(new PitchDifference(B2, 3D));
- List<PitchDifference> filteredSamples = filterByNote(samples, B3);
+ List<PitchDifference> filteredSamples = filterByNote(samples, B2);
for (PitchDifference sample : filteredSamples) {
- assertThat(sample.closest, is(B3));
+ assertThat(sample.closest, is(B2));
}
}
@@ -55,16 +55,16 @@ public class SamplerTest {
public void the_most_frequent_note_is_extracted_correctly() throws Exception {
List<PitchDifference> samples = new ArrayList<>();
- samples.add(new PitchDifference(E2, 2D));
- samples.add(new PitchDifference(E2, 2D));
- samples.add(new PitchDifference(B3, 3D));
- samples.add(new PitchDifference(E2, 2D));
+ samples.add(new PitchDifference(E6, 2D));
+ samples.add(new PitchDifference(E6, 2D));
+ samples.add(new PitchDifference(B2, 3D));
+ samples.add(new PitchDifference(E6, 2D));
samples.add(new PitchDifference(Note.G3, 4D));
- samples.add(new PitchDifference(B3, 3D));
+ samples.add(new PitchDifference(B2, 3D));
Note note = extractMostFrequentNote(samples);
- assertThat(note, is(E2));
+ assertThat(note, is(E6));
}
@Test
@@ -72,13 +72,13 @@ public class SamplerTest {
List<PitchDifference> samples = new ArrayList<>();
samples.add(new PitchDifference(G3, 2D));
- samples.add(new PitchDifference(E2, 2D));
- samples.add(new PitchDifference(B3, 3D));
- samples.add(new PitchDifference(E2, 2D));
- samples.add(new PitchDifference(B3, 3D));
+ samples.add(new PitchDifference(E6, 2D));
+ samples.add(new PitchDifference(B2, 3D));
+ samples.add(new PitchDifference(E6, 2D));
+ samples.add(new PitchDifference(B2, 3D));
Note note = extractMostFrequentNote(samples);
- assertThat(note, either(is(E2)).or(is(B3)));
+ assertThat(note, either(is(E6)).or(is(B2)));
}
}
\ No newline at end of file
