From a357a9b7e4aa0aa9e7e17c3e8e8d62f9d1ca4a90 Mon Sep 17 00:00:00 2001 From: moritsbw-cpu Date: Sun, 15 Nov 2026 04:42:26 +0000 Subject: [PATCH] Count the ten regional P4s as one station in the features; cap P(add on any station) at what the stations allow together (1 - prod(1 - p) over P3, P4, P5, P6, P8) Co-Authored-By: Claude Opus 5.5 --- scripts/second-pass.sh | 10 ++++++++++ src/model/adds.rs | 30 +++++++++++++++++++++--------- src/model/features.rs | 3 ++- src/model/panel.rs | 18 ++++++++++++++++++ 4 files changed, 51 insertions(+), 10 deletions(-) create mode 100755 scripts/second-pass.sh diff --git a/scripts/second-pass.sh b/scripts/second-pass.sh new file mode 100755 index 0000000..0187acf --- /dev/null +++ b/scripts/second-pass.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# One-off: when the first passes finish, run discographies and NMF artist pages again for the +# artists the pool added meanwhile, then refresh the forecasts and the site. +cd "$(dirname "$0")/.." || exit 1 +running() { pgrep -x airplay -a | grep -q -- "$1"; } +while running "only discographies"; do sleep 60; done +./target/release/airplay collect --only discographies +while running "only nmf-artists"; do sleep 60; done +./target/release/airplay collect --only nmf-artists --backfill +./target/release/airplay model rank --top 0 && systemctl restart airplay-web diff --git a/src/model/adds.rs b/src/model/adds.rs index f149903..f51cb07 100644 --- a/src/model/adds.rs +++ b/src/model/adds.rs @@ -19,7 +19,7 @@ use super::common::{mix, Rng}; use super::features::{self, LAGS, P}; use super::glm::{self, Design}; -use super::panel::{Panel, C}; +use super::panel::{group, Panel, C, GROUPS}; use anyhow::Result; use std::fmt::Write as _; @@ -84,7 +84,7 @@ pub fn p_release(p: &Panel, a: usize, t: usize) -> Option { Some(1.0 - (-per_year * W as f64 / 52.0).exp()) } -pub const EXTRA: &[&str] = &["in rotation on channel now", "in rotation anywhere now", "channels in rotation now (/14)", +pub const EXTRA: &[&str] = &["in rotation on channel now", "in rotation anywhere now", "station groups in rotation now (/5)", "run on channel = 1 week", "run = 2 weeks", "run = 3-5 weeks", "run >= 6 weeks", "near threshold (>= half of tau, not in rotation)", "plays / tau (capped 3, /3)", "weeks since in rotation on channel (/12)"]; @@ -93,7 +93,7 @@ pub const PC: usize = P + 10 + REL + WAVE; /// Artist-level ("any channel") rows. pub const ANY_NAMES: &[&str] = &[ "intercept", "log DR plays t", "log DR plays 4w", "log DR plays 12w", "log max DR plays 12w", - "in rotation anywhere now", "channels in rotation now (/14)", "current run anywhere (/12)", "weeks since in rotation anywhere (/12)", + "in rotation anywhere now", "station groups in rotation now (/5)", "current run anywhere (/12)", "weeks since in rotation anywhere (/12)", "Track Top-40 score", "Airplay Top-20 score", "chart entry recency 6w", "chart entry recency 26w", "log Track Top-40 hits", "log Airplay Top-20 hits", "Danish", "group", "female", "career years (/50)", "debut unknown", "Christmas in window", @@ -131,6 +131,13 @@ impl Rot { pub fn add_any_in_window(&self, a: usize, t: usize, h: usize) -> bool { (t + h + 1..=t + h + W).any(|w| self.add_any(a, w)) } } +/// Station groups (P4 once) where the artist is in rotation in week t. +fn groups_on(r: &Rot, a: usize, t: usize) -> f64 { + let mut on = [false; GROUPS]; + for c in 0..C { if r.on(a, c, t) { on[group(c)] = true; } } + on.iter().filter(|x| **x).count() as f64 +} + fn tau_of(_p: &Panel, r: &Rot, _a: usize, c: usize, _t: usize) -> f64 { r.tau[c] as f64 } fn run_and_since(flag: impl Fn(usize) -> bool, t: usize) -> (f64, f64) { @@ -144,13 +151,13 @@ fn christmas_in_window(p: &Panel, t: usize, h: usize) -> bool { (t + h + 1..=t + pub fn row_channel(p: &Panel, r: &Rot, a: usize, c: usize, t: usize, h: usize, rel: Option, out: &mut [f64]) { features::row(p, a, c, t, t + h + 1, &mut out[..P]); out[21] = christmas_in_window(p, t, h) as i32 as f64; - let n_on = (0..C).filter(|&k| r.on(a, k, t)).count() as f64; + let n_on = groups_on(r, a, t); let (run, since) = run_and_since(|w| r.on(a, c, w), t); let weeks = (run * LAGS as f64).round() as usize; let on = r.on(a, c, t); let ratio = p.y(a, c, t) / tau_of(p, r, a, c, t); let f = |b: bool| b as i32 as f64; - out[P..P + 10].copy_from_slice(&[f(on), f(r.any(a, t)), n_on / C as f64, + out[P..P + 10].copy_from_slice(&[f(on), f(r.any(a, t)), n_on / GROUPS as f64, f(weeks == 1), f(weeks == 2), f((3..=5).contains(&weeks)), f(weeks >= 6), f(!on && ratio >= 0.5), ratio.min(3.0) / 3.0, since]); out[P + 10..P + 10 + REL].copy_from_slice(&rel_feats(p, a, t, h, rel, on)); @@ -158,10 +165,10 @@ pub fn row_channel(p: &Panel, r: &Rot, a: usize, c: usize, t: usize, h: usize, r } pub fn row_any(p: &Panel, r: &Rot, a: usize, t: usize, h: usize, rel: Option, out: &mut [f64]) { - let tot = |w: usize| (0..C).map(|c| p.y(a, c, w)).sum::(); + let tot = |w: usize| p.group_total(a, w, None); let mean = |n: usize| (0..n).map(|i| tot(t - i)).sum::() / n as f64; let max12 = (0..LAGS).map(|i| tot(t - i)).fold(0.0, f64::max); - let n_on = (0..C).filter(|&k| r.on(a, k, t)).count() as f64; + let n_on = groups_on(r, a, t); let (run, since) = run_and_since(|w| r.any(a, w), t); let ch = p.chart(a, t); let art = &p.artists[a]; @@ -169,7 +176,7 @@ pub fn row_any(p: &Panel, r: &Rot, a: usize, t: usize, h: usize, rel: Option 0 { (41.0 - ch.t40_rank as f64) / 40.0 } else { 0.0 }, if ch.air_rank > 0 { (21.0 - ch.air_rank as f64) / 20.0 } else { 0.0 }, recency(6.0), recency(26.0), (ch.t40_hits as f64).ln_1p(), (ch.air_hits as f64).ln_1p(), @@ -268,7 +275,12 @@ impl AddModel { let mut xa = vec![0.0; PA]; row_any(p, r, a, t, self.h, rel, &mut xa); if let Some(f) = chart { f(&mut xa, CHART_IDX_ANY); } - (pc, platt(self.platt_any, glm::sigmoid(glm::dot(&self.any, &xa)))) + // Coherence: "any station" can't exceed what the stations allow together (P4 counted once, + // as its best region): at most 1 - prod(1 - p) over the station groups. + let mut best = [0.0f64; GROUPS]; + for c in 0..C { best[group(c)] = best[group(c)].max(pc[c]); } + let cap = 1.0 - best.iter().map(|p| 1.0 - p).product::(); + (pc, platt(self.platt_any, glm::sigmoid(glm::dot(&self.any, &xa))).min(cap.max(1e-6))) } } diff --git a/src/model/features.rs b/src/model/features.rs index 531ac67..bb7f3d2 100644 --- a/src/model/features.rs +++ b/src/model/features.rs @@ -35,7 +35,8 @@ pub fn christmas(p: &Panel, target: usize) -> bool { pub fn row(p: &Panel, a: usize, c: usize, t: usize, target: usize, out: &mut [f64]) { debug_assert!(t + 1 >= LAGS && out.len() == P); let y = |w: usize| p.y(a, c, w); - let others = |w: usize| (0..C).filter(|&k| k != c).map(|k| p.y(a, k, w)).sum::(); + // other station groups (the regional P4s count once) + let others = |w: usize| p.group_total(a, w, Some(super::panel::group(c))); let mean = |f: &dyn Fn(usize) -> f64, n: usize| (0..n).map(|i| f(t - i)).sum::() / n as f64; let max12 = (0..LAGS).map(|i| y(t - i)).fold(0.0, f64::max); let since = (0..LAGS).find(|&i| y(t - i) > 0.0).unwrap_or(LAGS) as f64 / LAGS as f64; diff --git a/src/model/panel.rs b/src/model/panel.rs index a4a9583..003f739 100644 --- a/src/model/panel.rs +++ b/src/model/panel.rs @@ -20,6 +20,24 @@ pub const C: usize = CHANNELS.len(); pub fn is_p4(c: usize) -> bool { CHANNELS[c].starts_with("p4") } +/// Station groups: P3, P4 (the ten regional P4s broadcast mostly the same national programme, +/// so they count as one), P5, P6 Beat, P8 Jazz. +pub const GROUPS: usize = 5; +pub fn group(c: usize) -> usize { match CHANNELS[c] { "p3" => 0, "p5" => 2, "p6beat" => 3, "p8jazz" => 4, _ => 1 } } + +impl Panel { + /// The artist's plays in week w across station groups (P4 = the mean of the regions), optionally + /// leaving out one group. + pub fn group_total(&self, a: usize, w: usize, skip: Option) -> f64 { + let (mut p4, mut n4, mut tot) = (0.0, 0.0, 0.0); + for c in 0..C { + if Some(group(c)) == skip { continue; } + if is_p4(c) { p4 += self.y(a, c, w); n4 += 1.0; } else { tot += self.y(a, c, w); } + } + tot + if n4 > 0.0 { p4 / n4 } else { 0.0 } + } +} + pub struct Artist { pub id: String, pub name: String,