IntervalSubmission: Avoid double-augmented or double-diminshed intervals

matevz · Mar 12, 2023 · 227fda3 · 227fda3
1 parent f961176
commit 227fda3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/notecheck/models.py b/notecheck/models.py
@@ -254,9 +254,11 @@ def get_pitch_pairs(self) -> []:
                     pitch1.accs = rnd.randrange(-ex.max_flats, ex.max_sharps+1)
                     pitch2.accs = rnd.randrange(-ex.max_flats, ex.max_sharps+1)
 
-                # Check other exercise constrains.
+                # Check other exercise constraints.
                 interval_candidate = Interval.from_diatonic_pitches((pitch1, pitch2), False)
-                if (ex.max_quantity == 0 or abs(interval_candidate.quantity) <= ex.max_quantity) and (ex.direction == 0 or interval_candidate.quantity / abs(interval_candidate.quantity) == ex.direction):
+                if (ex.max_quantity == 0 or abs(interval_candidate.quantity) <= ex.max_quantity) and \
+                   (ex.direction == 0 or interval_candidate.quantity / abs(interval_candidate.quantity) == ex.direction) and \
+                   interval_candidate.quality >= -2 and interval_candidate.quality <= 2:
                     pitch_pair = (pitch1, pitch2)
 
             pitch_pairs.append( pitch_pair )