Fix impl PartialOrd for Fraction being totally wrong.

scorefall · Dec 21, 2019 · b5a8bb5 · b5a8bb5
1 parent 9b09d9a
commit b5a8bb5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,3  37,5 @@ categories = ["data-structures", "encoding", "parser-implementations"]
 muon-rs = "0.2"
 serde = "1.0"
 serde_derive = "1.0"
 cala = { version = "0.7", default-features = false, features = [] }
 # devout = "0.0"
diff --git a/src/fraction.rs b/src/fraction.rs
@@ -130,14  130,10 @@ impl PartialEq for Fraction {
 
 impl PartialOrd for Fraction {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        let den = gcd_i(self.den, other.den);
         let self_int = self.num as i32 * other.den as i32;
         let other_int = other.num as i32 * self.den as i32;
 
-        let self_mul = (den / self.den) as i32;
-        let other_mul = (den / other.den) as i32;
-
-        let num = self.num as i32 * self_mul - other.num as i32 * other_mul;
-
-        num.partial_cmp(&0)
         (self_int-other_int).partial_cmp(&0)
     }
 }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -19,6  19,8 @@ use muon_rs as muon;
 use serde_derive::{Deserialize, Serialize};
 use std::str::FromStr;
 
 use cala;
 
 pub mod note;
 mod fraction;
 
@@ -549,18  551,23 @@ impl Scof {
     pub fn set_duration(&mut self, cursor: &Cursor, dur: Fraction) {
         let mut note = self.note(cursor).unwrap();
         let old = note.duration;
         cala::info!("AAAA1");
         note.set_duration(dur);
         cala::info!("AAAA2");
         if old > dur {
             cala::info!("Shorter {} - {}", old, dur);
             // FIXME: Note is becoming shorter.
             let _rests = old - dur;
 
 
         } else {
             cala::info!("Longer {} - {}", dur, old);
             // FIXME: Note is becoming longer.
             let _tied_value = dur - old;
 
 
         }
         cala::info!("AAAA3");
         let m = self.marking_str_mut(cursor).unwrap();
         *m = note.to_string();
     }