diff --git a/src/model/synth.rs b/src/model/synth.rs index 376b686..c69dc99 100644 --- a/src/model/synth.rs +++ b/src/model/synth.rs @@ -43,7 +43,7 @@ pub fn create_tables(db: &Db) -> Result<()> { "CREATE TABLE IF NOT EXISTS synthetic_rotation ( channel TEXT NOT NULL, iso_year INTEGER NOT NULL, iso_week INTEGER NOT NULL, song TEXT NOT NULL, artist TEXT, title TEXT, - plays_per_day REAL NOT NULL, category TEXT NOT NULL, -- A | B | C (estimated) + plays_per_day REAL NOT NULL, category TEXT NOT NULL, -- 'listed' (on the list or not; formats changed over the years) days INTEGER NOT NULL, hours_covered INTEGER NOT NULL, source TEXT NOT NULL, PRIMARY KEY (channel, iso_year, iso_week, song) ); @@ -106,7 +106,8 @@ pub fn run(db: &Db, p: &Panel) -> Result { } writeln!(md, "## 1. Plays per day by category (exact plays vs DR's lists)\n")?; writeln!(md, "Weeks used: {}.\n", if used.is_empty() { "none yet".to_string() } else { used.iter().take(6).cloned().collect::>().join(", ") + if used.len() > 6 { " …" } else { "" } })?; - writeln!(md, "| Channel | A median | B median | C median | Not listed, 90th pct | Threshold A | B | C |\n|---|---|---|---|---|---|---|---|")?; + writeln!(md, "Synthetic lists only say \"on the list or not\": DR's list formats have changed over the years, and A/B can't be told apart from plays on every channel. The category medians are for reference.\n")?; + writeln!(md, "| Channel | A median | B median | C median | Not listed, 90th pct | On-list threshold (plays/day) |\n|---|---|---|---|---|---|")?; let med = |v: &mut Vec| { if v.is_empty() { return f64::NAN; } v.sort_by(f64::total_cmp); v[v.len() / 2] }; let pct = |v: &mut Vec, q: f64| { if v.is_empty() { return f64::NAN; } v.sort_by(f64::total_cmp); v[((v.len() - 1) as f64 * q) as usize] }; let mut thresholds: HashMap = HashMap::new(); @@ -137,7 +138,7 @@ pub fn run(db: &Db, p: &Panel) -> Result { } } writeln!(md, "| {lc} | {:.1} | {:.1} | {:.1} | {:.1} | {} |", m[0], m[1], m[2], nl, - thresholds.get(lc).map(|t| format!("{:.1} | {:.1} | {:.1}", t[0], t[1], t[2])).unwrap_or("— | — | —".into()))?; + thresholds.get(lc).map(|t| format!("{:.1}", t[2])).unwrap_or("—".into()))?; } // In-sample check: how well the thresholds reproduce the list in the weeks used. let mut hit = [[0usize; 4]; 4]; @@ -147,8 +148,7 @@ pub fn run(db: &Db, p: &Panel) -> Result { let listed_total: usize = (0..3).map(|t| hit[t].iter().sum::()).sum(); let listed_found: usize = (0..3).map(|t| hit[t][..3].iter().sum::()).sum(); let false_pos: usize = hit[3][..3].iter().sum(); - writeln!(md, "\nIn-sample check (song-weeks): listed songs found {listed_found} of {listed_total}; songs wrongly put on the list {false_pos}; exact category {} of {listed_total}. Thresholds are refitted as exact plays and lists for the same weeks accumulate.\n", - (0..3).map(|t| hit[t][t]).sum::())?; + writeln!(md, "\nIn-sample check (song-weeks): listed songs found {listed_found} of {listed_total}; songs wrongly put on the list {false_pos}. Thresholds are refitted as exact plays and lists for the same weeks accumulate.\n")?; // ---- 2. apply to the archive let has_archive: i64 = db.conn.query_row("SELECT count(*) FROM sqlite_master WHERE name = 'archive_plays'", [], |r| r.get(0))?; @@ -183,10 +183,9 @@ pub fn run(db: &Db, p: &Panel) -> Result { for (s, (cnt, a, t)) in &wk.songs { if *cnt < 3.0 { continue; } // a song needs 3+ plays in the sample to count let ppd = cnt / day_equiv; - let k = cat_of(th, ppd); - if k == 3 { continue; } + if ppd < th[2] { continue; } tx.execute("INSERT OR REPLACE INTO synthetic_rotation VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, 'wayback')", - rusqlite::params![lc, y, w, s, a, t, ppd, CATS[k], days as i64, hours as i64])?; + rusqlite::params![lc, y, w, s, a, t, ppd, "listed", days as i64, hours as i64])?; n += 1; } let e = summary.entry((st.clone(), *y)).or_insert((0, 0)); @@ -195,7 +194,7 @@ pub fn run(db: &Db, p: &Panel) -> Result { tx.commit()?; writeln!(md, "| Station | Year | Weeks with a synthetic list | Avg songs listed per week |\n|---|---|---|---|")?; for ((st, y), (wks, n)) in &summary { writeln!(md, "| {st} | {y} | {wks} | {:.0} |", *n as f64 / *wks as f64)?; } - writeln!(md, "\nA week needs at least 36 archived hours and a song at least 3 plays in them; plays are scaled to a full day by the hours covered. A/B is uncertain from a few sampled days (P3: A ≈ 4.7, B ≈ 3.3 plays a day); on P4, A and B get the same plays, so P4 synthetic lists only mean \"on the list\".\n")?; + writeln!(md, "\nA week needs at least 36 archived hours and a song at least 3 plays in them; plays are scaled to a full day by the hours covered.\n")?; } // ---- 3. IFPI Airplay Top-20 position vs DR plays