Skip to content

Commit

Permalink
Added every missing interval up to two octaves (#45)
Browse files Browse the repository at this point in the history
  • Loading branch information
@chieffancypants
chieffancypants authored Dec 18, 2024
1 parent cc8c546 commit 074d080
Show file tree
Hide file tree
Showing 2 changed files with 163 additions and 3 deletions.
160 changes: 157 additions & 3 deletions Sources/Tonic/Interval.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Foundation
/// The distance between two notes.
///
/// An interval distance is measured in degree (number of letters away) and
/// quality of the interval (essentialy number of semitones away).
/// quality of the interval (essentially number of semitones away).
/// Some Intervals refer to the same difference in pitch.
public enum Interval: Int, CaseIterable, Codable {
/// Perfect Unison
Expand All @@ -14,15 +14,24 @@ public enum Interval: Int, CaseIterable, Codable {
/// Augmented Unison
case A1

/// Diminished Second
case d2

/// Minor Second
case m2

/// Diminished Third
case d3

/// Major Second
case M2

/// Minor Third
case m3

/// Augmented Second
case A2

/// Major Third
case M3

Expand All @@ -32,6 +41,9 @@ public enum Interval: Int, CaseIterable, Codable {
/// Perfect Fourth
case P4

/// Augmented Third
case A3

/// Augmented Fourth
case A4

Expand All @@ -44,6 +56,9 @@ public enum Interval: Int, CaseIterable, Codable {
/// Augmented Fifth
case A5

/// Diminished Sixth
case d6

/// Minor Sixth
case m6

Expand All @@ -62,13 +77,19 @@ public enum Interval: Int, CaseIterable, Codable {
/// Major Seventh
case M7

/// Augmented Seventh
case A7

/// Diminished Octave
case d8

/// Perfect Octave
case P8

/// AugmentedOctave
/// Diminished Ninth
case d9

/// Augmented Octave
case A8

/// Minor Ninth
Expand All @@ -80,6 +101,18 @@ public enum Interval: Int, CaseIterable, Codable {
/// Augmented Ninth
case A9

/// Diminished Tenth
case d10

/// Minor Tenth
case m10

/// Major Tenth
case M10

/// Augmented Tenth
case A10

/// Diminished Eleventh
case d11

Expand All @@ -89,6 +122,18 @@ public enum Interval: Int, CaseIterable, Codable {
/// Augmented Eleventh
case A11

/// Diminished Twelfth
case d12

/// Perfect Twelfth
case P12

/// Augmented Twelfth
case A12

/// Diminished Thirteenth
case d13

/// Minor Thirteenth
case m13

Expand All @@ -98,39 +143,82 @@ public enum Interval: Int, CaseIterable, Codable {
/// Augmented Thirteenth
case A13

/// Diminished Fourteenth
case d14

/// Minor Fourteenth
case m14

/// Major Fourteenth
case M14

/// Augmented Fourteenth
case A14

/// Diminished Fifteenth
case d15

/// Perfect Fifteenth
case P15

/// Augmented Fifteenth
case A15

/// Number of semitones the interval spans
public var semitones: Int {
switch self {
case .P1: return 0
case .d2: return 0
case .A1: return 1
case .m2: return 1
case .M2: return 2
case .d3: return 2
case .m3: return 3
case .A2: return 3
case .M3: return 4
case .d4: return 4
case .P4: return 5
case .A3: return 5
case .A4: return 6
case .d5: return 6
case .P5: return 7
case .A5: return 8
case .d6: return 7
case .m6: return 8
case .A5: return 8
case .d7: return 9
case .M6: return 9
case .A6: return 10
case .m7: return 10
case .M7: return 11
case .d8: return 11
case .P8: return 12
case .A7: return 12
case .d9: return 12
case .A8: return 13
case .m9: return 13
case .M9: return 14
case .d10: return 14
case .A9: return 15
case .m10: return 15
case .d11: return 16
case .M10: return 16
case .P11: return 17
case .A10: return 17
case .d12: return 18
case .A11: return 18
case .P12: return 19
case .d13: return 19
case .m13: return 20
case .A12: return 20
case .d14: return 21
case .M13: return 21
case .m14: return 22
case .A13: return 22
case .d15: return 23
case .M14: return 23
case .P15: return 24
case .A14: return 24
case .A15: return 25
}
}

Expand All @@ -139,34 +227,56 @@ public enum Interval: Int, CaseIterable, Codable {
switch self {
case .P1: return 1
case .A1: return 1
case .d2: return 2
case .m2: return 2
case .M2: return 2
case .A2: return 2
case .d3: return 3
case .m3: return 3
case .M3: return 3
case .A3: return 3
case .d4: return 4
case .P4: return 4
case .A4: return 4
case .d5: return 5
case .P5: return 5
case .A5: return 5
case .d6: return 6
case .m6: return 6
case .M6: return 6
case .A6: return 6
case .d7: return 7
case .m7: return 7
case .M7: return 7
case .A7: return 7
case .d8: return 8
case .P8: return 8
case .A8: return 8
case .d9: return 9
case .m9: return 9
case .M9: return 9
case .A9: return 9
case .m10: return 10
case .d10: return 10
case .M10: return 10
case .A10: return 10
case .d11: return 11
case .P11: return 11
case .A11: return 11
case .d12: return 12
case .P12: return 12
case .A12: return 12
case .d13: return 13
case .m13: return 13
case .M13: return 13
case .A13: return 13
case .d14: return 14
case .m14: return 14
case .M14: return 14
case .A14: return 14
case .d15: return 15
case .P15: return 15
case .A15: return 15
}
}

Expand Down Expand Up @@ -202,34 +312,56 @@ extension Interval: CustomStringConvertible {
switch self {
case .P1: return "P1"
case .A1: return "A1"
case .d2: return "d2"
case .m2: return "m2"
case .A2: return "A2"
case .M2: return "M2"
case .d3: return "d3"
case .m3: return "m3"
case .M3: return "M3"
case .A3: return "A3"
case .d4: return "d4"
case .P4: return "P4"
case .A4: return "A4"
case .d5: return "d5"
case .P5: return "P5"
case .A5: return "A5"
case .d6: return "d6"
case .m6: return "m6"
case .M6: return "M6"
case .A6: return "A6"
case .d7: return "d7"
case .m7: return "m7"
case .M7: return "M7"
case .A7: return "A7"
case .d8: return "d8"
case .P8: return "P8"
case .A8: return "A8"
case .d9: return "d9"
case .m9: return "m9"
case .M9: return "M9"
case .A9: return "A9"
case .d10: return "d10"
case .m10: return "m10"
case .M10: return "M10"
case .A10: return "A10"
case .d11: return "d11"
case .d12: return "d12"
case .P11: return "P11"
case .A11: return "A11"
case .P12: return "P12"
case .A12: return "A12"
case .d13: return "D13"
case .m13: return "m13"
case .M13: return "M13"
case .A13: return "A13"
case .d14: return "d14"
case .m14: return "m14"
case .M14: return "M14"
case .A14: return "A14"
case .d15: return "d15"
case .P15: return "P15"
case .A15: return "A15"
}
}

Expand All @@ -238,34 +370,56 @@ extension Interval: CustomStringConvertible {
switch self {
case .P1: return "Perfect Unison"
case .A1: return "Augmented Unison"
case .d2: return "Diminished Second"
case .m2: return "Minor Second"
case .M2: return "Major Second"
case .A2: return "Augmented Second"
case .d3: return "Diminished Third"
case .m3: return "Minor Third"
case .M3: return "Major Third"
case .A3: return "Augmented Third"
case .d4: return "Diminished Fourth"
case .P4: return "Perfect Fourth"
case .A4: return "Augmented Fourth"
case .d5: return "Diminished Fifth"
case .P5: return "Perfect Fifth"
case .A5: return "Augmented Fifth"
case .d6: return "Diminished Sixth"
case .m6: return "Minor Sixth"
case .M6: return "Major Sixth"
case .A6: return "Augmented Sixth"
case .d7: return "Diminished Seventh"
case .m7: return "Minor Seventh"
case .M7: return "Major Seventh"
case .A7: return "Augmented Seventh"
case .d8: return "Diminished Octave"
case .P8: return "Perfect Octave"
case .A8: return "Augmented Octave"
case .d9: return "Diminished Ninth"
case .m9: return "Minor Ninth"
case .M9: return "Major Ninth"
case .A9: return "Augmented Ninth"
case .d10: return "Diminished Tenth"
case .m10: return "Minor Tenth"
case .M10: return "Major Tenth"
case .A10: return "Augmented Tenth"
case .d11: return "Diminished Eleventh"
case .P11: return "Perfect Eleventh"
case .A11: return "Augmented Eleventh"
case .d12: return "Diminished Twelfth"
case .P12: return "Perfect Twelfth"
case .A12: return "Augmented Twelfth"
case .d13: return "Diminished Thirteenth"
case .m13: return "Minor Thirteenth"
case .M13: return "Major Thirteenth"
case .A13: return "Augmented Thirteenth"
case .d14: return "Diminished Fourteenth"
case .m14: return "Minor Fourteenth"
case .M14: return "Major Fourteenth"
case .A14: return "Augmented Fourteenth"
case .d15: return "Diminished Fifteenth"
case .P15: return "Perfect Fifteenth"
case .A15: return "Augmented Fifteenth"
}
}
}
6 changes: 6 additions & 0 deletions Tests/TonicTests/IntervalTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@ import XCTest
final class IntervalTests: XCTestCase {
func testIntervalBetween() {
XCTAssertEqual(Interval.betweenNotes(.C, .D), .M2)
XCTAssertEqual(Interval.betweenNotes(.C, .Ds), .A2)
XCTAssertEqual(Interval.betweenNotes(.C, .G), .P5)
XCTAssertEqual(Interval.betweenNotes(.G, .C), .P5)
XCTAssertEqual(Interval.betweenNotes(.C, .Fs), .A4)
XCTAssertEqual(Interval.betweenNotes(.C, .Gb), .d5)
XCTAssertEqual(Interval.betweenNotes(.C, Note(.D, accidental: .doubleFlat)), .d2)
XCTAssertEqual(Interval.betweenNotes(.D, Note(.F, accidental: .flat)), .d3)
XCTAssertEqual(Interval.betweenNotes(Note(.C, octave: 1), Note(.D, octave: 2)), .M9)
XCTAssertEqual(Interval.betweenNotes(Note(.C, octave: 1), Note(.C, octave: 2)), .P8)
XCTAssertEqual(Interval.betweenNotes(Note(.C, octave: 1), Note(.C, accidental: .flat, octave: 0)), .A1)
XCTAssertEqual(Interval.betweenNotes(Note(.C, octave: 1), Note(.C, accidental: .flat, octave: 1)), .d8)
XCTAssertEqual(Interval.betweenNotes(Note(.C, octave: 1), Note(.C, accidental: .sharp, octave: 2)), .A8)
XCTAssertEqual(Interval.betweenNotes(Note(.C, octave: 1), Note(.A, accidental: .doubleFlat, octave: 2)), .d13)
XCTAssertEqual(Interval.betweenNotes(Note(.C, octave: 1), Note(.C, accidental: .sharp, octave: 3)), .A15)
XCTAssertEqual(Interval.betweenNotes(Note(.C, octave: 1), Note(.C, octave: 3)), .P15)
}
}

0 comments on commit 074d080

Please sign in to comment.