7d587d0c4e
Add `PrimitiveBuilder::bind(slot, value)`: bind a declared param to a structural constant, removed from param_space entirely rather than pinned in the injected vector. This closes the gap #55 names — param-bearing nodes (Sma/Exposure/LinComb) had no constant path, only the no-sweep-mode SimBroker precedent. The motivating case is "SMA2-entry": the 2 is bound to the two-candle construction, so sweeping it would enumerate deformed strategies as valid family members. Approach (Option B, builder-level — the originally-planned direction): bind shrinks the builder's declared param surface (schema.params) and wraps its build closure to re-splice the captured constant at its original positional slot. The construction layer (collect_params / lower_items / param_space / compile_with_params) is byte-unchanged: both dock sites already key off builder.params(), so the shrink propagates for free. Addressing is by param name (the by-name authoring address space, C23/0032); the compilat stays wired by raw index — names never reach it. bind enforces "exactly one open param matches" itself (collect-all-then-reject, panic on zero / on duplicate), mirroring the resolve binder's posture, because a node's own schema.params is not covered by check_param_namespace_injective. Chained binds reconstruct the correct positional vector because each layer computes its slot index relative to the param list it sees (no global position table). Considered and rejected: a per-node builder_const(N) constructor (explodes combinatorially over which subset is constant, not dynamic); a ParamBinding overlay struct on Composite (would need new bookkeeping the builder-level form avoids). Verified: cargo build/clippy/test --workspace all green; new tests cover slot removal, positional reconstruction (chained + partial, via eval), the three panic paths, and the composite param_space projection; blueprint.rs construction layer confirmed byte-unchanged. Deferred (out of scope, follow-up issue): exporting a named frozen strategy as a blueprint-as-values collection — the issue's third fork, needs its own brainstorm. closes #55
176 lines
6.6 KiB
Rust
176 lines
6.6 KiB
Rust
//! `Sma` — simple moving average over the last `length` values of one f64
|
|
//! input. The walking skeleton's first worked node: it proves the `aura-core`
|
|
//! `Node` contract is authorable from a downstream crate and evaluable with no
|
|
//! engine present (the test drives it by hand, as the sim loop later will).
|
|
|
|
use aura_core::{
|
|
Ctx, FieldSpec, Firing, Node, NodeSchema, ParamSpec, PortSpec, PrimitiveBuilder, Scalar,
|
|
ScalarKind,
|
|
};
|
|
|
|
/// Simple moving average over the last `length` values of one f64 input.
|
|
pub struct Sma {
|
|
length: usize,
|
|
out: [Scalar; 1],
|
|
}
|
|
|
|
impl Sma {
|
|
/// Build an SMA of window `length` (must be >= 1).
|
|
pub fn new(length: usize) -> Self {
|
|
assert!(length >= 1, "SMA length must be >= 1");
|
|
Self { length, out: [Scalar::F64(0.0)] }
|
|
}
|
|
|
|
/// The param-generic recipe for a blueprint primitive: declares `length` and builds
|
|
/// through `Sma::new` (the single sizing/validation gate; the slice is
|
|
/// kind-checked before `build` runs, so the typed read is total).
|
|
pub fn builder() -> PrimitiveBuilder {
|
|
PrimitiveBuilder::new(
|
|
"SMA",
|
|
NodeSchema {
|
|
inputs: vec![PortSpec { kind: ScalarKind::F64, firing: Firing::Any, name: "series".into() }],
|
|
output: vec![FieldSpec { name: "value", kind: ScalarKind::F64 }],
|
|
params: vec![ParamSpec { name: "length".into(), kind: ScalarKind::I64 }],
|
|
},
|
|
|p| Box::new(Sma::new(p[0].as_i64().expect("length slot is I64") as usize)),
|
|
)
|
|
}
|
|
}
|
|
|
|
impl Node for Sma {
|
|
fn lookbacks(&self) -> Vec<usize> {
|
|
vec![self.length]
|
|
}
|
|
|
|
fn eval(&mut self, ctx: Ctx<'_>) -> Option<&[Scalar]> {
|
|
let w = ctx.f64_in(0);
|
|
if w.len() < self.length {
|
|
return None; // not yet warmed up
|
|
}
|
|
let mut sum = 0.0;
|
|
for k in 0..self.length {
|
|
sum += w[k]; // index 0 = newest (financial indexing)
|
|
}
|
|
self.out[0] = Scalar::F64(sum / self.length as f64);
|
|
Some(&self.out)
|
|
}
|
|
|
|
fn label(&self) -> String {
|
|
format!("SMA({})", self.length)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use aura_core::{AnyColumn, Timestamp};
|
|
|
|
#[test]
|
|
fn sma_warms_up_then_tracks_the_window_mean() {
|
|
let sma_for_depth = Sma::new(3);
|
|
|
|
// size the input column from the node's lookback, as bootstrap will at wiring
|
|
let mut inputs =
|
|
vec![AnyColumn::with_capacity(ScalarKind::F64, sma_for_depth.lookbacks()[0])];
|
|
let mut sma = sma_for_depth;
|
|
|
|
let feed = [1.0_f64, 2.0, 3.0, 4.0, 5.0];
|
|
// means of [1,2,3], [2,3,4], [3,4,5] once warmed up
|
|
let expect = [None, None, Some(2.0), Some(3.0), Some(4.0)];
|
|
|
|
for (v, want) in feed.iter().zip(expect) {
|
|
inputs[0].push(Scalar::F64(*v)).unwrap();
|
|
let got = sma.eval(Ctx::new(&inputs, Timestamp(0)));
|
|
match want {
|
|
None => assert_eq!(got, None),
|
|
Some(m) => assert_eq!(got, Some([Scalar::F64(m)].as_slice())),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn sma_length_one_is_identity() {
|
|
let mut sma = Sma::new(1);
|
|
let mut inputs = vec![AnyColumn::with_capacity(ScalarKind::F64, 1)];
|
|
|
|
inputs[0].push(Scalar::F64(7.0)).unwrap();
|
|
assert_eq!(sma.eval(Ctx::new(&inputs, Timestamp(0))), Some([Scalar::F64(7.0)].as_slice()));
|
|
|
|
inputs[0].push(Scalar::F64(9.0)).unwrap();
|
|
assert_eq!(sma.eval(Ctx::new(&inputs, Timestamp(0))), Some([Scalar::F64(9.0)].as_slice()));
|
|
}
|
|
|
|
#[test]
|
|
fn labels_carry_identifying_params() {
|
|
use crate::{Add, Exposure, LinComb, Recorder, SimBroker, Sub};
|
|
use aura_core::{Firing, ScalarKind};
|
|
|
|
// the load-bearing payoff: two SMAs disambiguate by window
|
|
assert_eq!(Sma::new(2).label(), "SMA(2)");
|
|
assert_eq!(Sma::new(4).label(), "SMA(4)");
|
|
// param-carrying single nodes
|
|
assert_eq!(Exposure::new(0.5).label(), "Exposure(0.5)");
|
|
assert_eq!(SimBroker::new(0.0001).label(), "SimBroker(0.0001)");
|
|
// bare-kind nodes (identity is not a mis-wiring axis here, per spec)
|
|
assert_eq!(Sub::new().label(), "Sub");
|
|
assert_eq!(Add::new().label(), "Add");
|
|
assert_eq!(LinComb::new(vec![1.0, -1.0]).label(), "LinComb");
|
|
let (tx, _rx) = std::sync::mpsc::channel();
|
|
assert_eq!(Recorder::new(&[ScalarKind::F64], Firing::Any, tx).label(), "Recorder");
|
|
}
|
|
|
|
#[test]
|
|
fn nodes_declare_expected_params() {
|
|
use crate::{Add, Exposure, LinComb, Recorder, SimBroker, Sub};
|
|
use aura_core::{Firing, ParamSpec, ScalarKind};
|
|
// single scalar knobs (declared on the param-generic builder, pre-build)
|
|
assert_eq!(
|
|
Sma::builder().schema().params,
|
|
vec![ParamSpec { name: "length".into(), kind: ScalarKind::I64 }],
|
|
);
|
|
assert_eq!(
|
|
Exposure::builder().schema().params,
|
|
vec![ParamSpec { name: "scale".into(), kind: ScalarKind::F64 }],
|
|
);
|
|
// vector knob expands flat to N indexed F64 entries
|
|
let lc = LinComb::builder(2).schema().params.clone();
|
|
assert_eq!(lc.len(), 2);
|
|
assert_eq!(lc[0].name, "weights[0]");
|
|
assert_eq!(lc[1].name, "weights[1]");
|
|
assert!(lc.iter().all(|p| p.kind == ScalarKind::F64));
|
|
// param-less nodes declare empty
|
|
assert!(Sub::builder().schema().params.is_empty());
|
|
assert!(Add::builder().schema().params.is_empty());
|
|
assert!(SimBroker::builder(0.0001).schema().params.is_empty());
|
|
let (tx, _rx) = std::sync::mpsc::channel();
|
|
assert!(
|
|
Recorder::builder(vec![ScalarKind::F64], Firing::Any, tx)
|
|
.schema()
|
|
.params
|
|
.is_empty()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn input_slot_is_named_series() {
|
|
assert_eq!(Sma::builder().schema().inputs[0].name, "series");
|
|
}
|
|
|
|
#[test]
|
|
fn bind_removes_slot_from_param_space() {
|
|
// a bound param-bearing node reports an empty param surface — parity with the
|
|
// SimBroker precedent (nodes_declare_expected_params, this file)
|
|
let sma2 = Sma::builder().named("bias").bind("length", Scalar::I64(2));
|
|
assert!(sma2.schema().params.is_empty());
|
|
// contrast: the length-generic SMA keeps `length` open
|
|
assert_eq!(Sma::builder().named("bias").params().len(), 1);
|
|
}
|
|
|
|
#[test]
|
|
fn bound_node_builds_with_injected_value() {
|
|
// built with an empty open slice, the bound builder yields SMA(2)
|
|
let node = Sma::builder().bind("length", Scalar::I64(2)).build(&[]);
|
|
assert_eq!(node.label(), "SMA(2)");
|
|
}
|
|
}
|