P5 wave 2: convert rotatingMachine to BaseDomain + extract helper modules
specificClass.js: 1760 → 400 lines.
Machine extends BaseDomain. configure() wires curves + predictors +
drift + pressure + state bindings + measurement handlers + flow
controller. ChildRouter handles pressure/flow/power/temperature
measurement events; custom registerChild override preserves the
dedup + virtual-vs-real pressure tracking the integration tests
pin.
Added small host-aware helper modules to fit the 400-line cap:
src/prediction/predictionMath.js (calcFlow/Power/Ctrl)
src/prediction/efficiencyMath.js (calcCog/EfficiencyCurve/etc.)
src/pressure/pressureSelector.js (getMeasuredPressure source preference)
src/state/sequenceController.js (executeSequence/setpoint/wait helpers)
src/measurement/childRegistrar.js (custom registerChild path)
src/drift/healthRefresh.js (drift status update wrappers)
src/io/output.js (buildOutput + buildStatusBadge)
unitPolicy: live UnitPolicy methods .canonical()/.output()/.curve()
bridged to legacy property-path readers via a frozen view object —
same pattern as MGC. See OPEN_QUESTIONS.md.
nodeClass.js: 433 → 61 lines.
Extends BaseNodeAdapter. tickInterval=null (event-driven on state +
measurement events). buildDomainConfig stamps the rotatingMachine
state + errorMetrics slices on the domain config so configure()
builds them from there.
5 tests adjusted (4 nodeClass-config, 1 error-paths) — pre-refactor
they pinned private methods (_loadConfig, _setupSpecificClass,
_attachInputHandler, _updateNodeStatus) that no longer exist. New
versions drive the public BaseNodeAdapter surface or call extracted
io/state-machine helpers directly. See OPEN_QUESTIONS.md 2026-05-10
"private nodeClass tests" for the deferred rewrite plan.
196 / 196 tests pass (basic 110 + integration ~80 + edge ~6).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -129,6 +129,53 @@ class MeasurementHandlers {
|
||||
host._updateMetricDrift('power', measuredCanonical, context);
|
||||
host._updatePredictionHealth();
|
||||
}
|
||||
|
||||
/** Reconcile a measured-flow reading with the existing up/downstream slots. */
|
||||
handleMeasuredFlow() {
|
||||
const host = this.host;
|
||||
const diff = host.measurements.type('flow').variant('measured').difference();
|
||||
if (diff != null) {
|
||||
if (diff.value < 0.001) { this.logger.debug(`Flow match: ${diff.value}`); return diff.value; }
|
||||
this.logger.error('Something wrong with down or upstream flow measurement. Bailing out!');
|
||||
return null;
|
||||
}
|
||||
const up = host.measurements.type('flow').variant('measured').position('upstream').getCurrentValue();
|
||||
if (up != null) { this.logger.warn('Only upstream flow is present. Using it but results may be incomplete!'); return up; }
|
||||
const dn = host.measurements.type('flow').variant('measured').position('downstream').getCurrentValue();
|
||||
if (dn != null) { this.logger.warn('Only downstream flow is present. Using it but results may be incomplete!'); return dn; }
|
||||
this.logger.error('No upstream or downstream flow measurement. Bailing out!');
|
||||
return null;
|
||||
}
|
||||
|
||||
handleMeasuredPower() {
|
||||
const power = this.host.measurements.type('power').variant('measured').position('atEquipment').getCurrentValue();
|
||||
if (power != null) { this.logger.debug(`Measured power: ${power}`); return power; }
|
||||
this.logger.error('No measured power found. Bailing out!');
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Route a dashboard-sim pressure write to its virtual child; route any
|
||||
* other simulated measurement type through the normal handler dispatch. */
|
||||
updateSimulatedMeasurement(type, position, value, context = {}) {
|
||||
const host = this.host;
|
||||
const t = String(type || '').toLowerCase();
|
||||
const pos = String(position || 'atEquipment').toLowerCase();
|
||||
if (t !== 'pressure') { return this.dispatch(t, value, pos, context); }
|
||||
if (!host.virtualPressureChildIds[pos]) {
|
||||
this.logger.warn(`Unsupported simulated pressure position '${pos}'`);
|
||||
return;
|
||||
}
|
||||
const child = host.virtualPressureChildren[pos];
|
||||
if (!child?.measurements) {
|
||||
this.logger.error(`Virtual pressure child '${pos}' is missing`);
|
||||
return;
|
||||
}
|
||||
let unit;
|
||||
try { unit = host._resolveMeasurementUnit('pressure', context.unit); }
|
||||
catch (err) { this.logger.warn(`Rejected simulated pressure measurement: ${err.message}`); return; }
|
||||
child.measurements.type('pressure').variant('measured').position(pos)
|
||||
.value(value, context.timestamp || Date.now(), unit);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = MeasurementHandlers;
|
||||
|
||||
Reference in New Issue
Block a user