RnD/rotatingMachine
3
0
Fork 3
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Implement reactor recirculation' (#4) from dev-Pieter into main

Browse Source 
Reviewed-on: #4
This commit is contained in:
p.vanderwilt
2025-11-06 13:58:25 +00:00
parent 5a14f44fdd b6d268659a
commit 0a98b12224
3 changed files with 90 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rotatingMachine.html
View File

@@ -24,7 +24,8 @@
warmup: { value: 0 }, warmup: { value: 0 },
shutdown: { value: 0 }, shutdown: { value: 0 },
cooldown: { value: 0 }, cooldown: { value: 0 },
machineCurve : { value: {}}, machineCurve: { value: {}},
flowNumber: { value: 1, required: true },
//define asset properties //define asset properties
uuid: { value: "" }, uuid: { value: "" },
@@ -127,6 +128,10 @@
<label for="node-input-cooldown"><i class="fa fa-clock-o"></i> Cooldown Time</label> <label for="node-input-cooldown"><i class="fa fa-clock-o"></i> Cooldown Time</label>
<input type="number" id="node-input-cooldown" style="width:60%;" /> <input type="number" id="node-input-cooldown" style="width:60%;" />
</div> </div>
<div class="form-row">
<label for="node-input-flowNumber"><i class="fa fa-clock-o"></i> Flow Number</label>
<input type="number" id="node-input-flowNumber" style="width:60%;" />
</div>
<!-- Asset fields injected here --> <!-- Asset fields injected here -->
<div id="asset-fields-placeholder"></div> <div id="asset-fields-placeholder"></div>

3
src/nodeClass.js
View File

@@ -63,7 +63,8 @@ class nodeClass {
}, },
functionality: { functionality: {
positionVsParent: uiConfig.positionVsParent positionVsParent: uiConfig.positionVsParent
} },
flowNumber: uiConfig.flowNumber
}; };
// Utility for formatting outputs // Utility for formatting outputs

138
src/specificClass.js
View File

@@ -68,6 +68,10 @@ class Machine {
this.updatePosition(); this.updatePosition();
}); });
// used for holding the source and sink unit operations or other object with setInfluent / getEffluent method for e.g. recirculation.
this.upstreamSource = null;
this.downstreamSink = null;
this.child = {}; // object to hold child information so we know on what to subscribe this.child = {}; // object to hold child information so we know on what to subscribe
this.childRegistrationUtils = new childRegistrationUtils(this); // Child registration utility this.childRegistrationUtils = new childRegistrationUtils(this); // Child registration utility
@@ -75,72 +79,83 @@ class Machine {
/*------------------- Register child events -------------------*/ /*------------------- Register child events -------------------*/
registerChild(child, softwareType) { registerChild(child, softwareType) {
this.logger.debug('Setting up child event for softwaretype ' + softwareType); if(!child) {
this.logger.error(`Invalid ${softwareType} child provided.`);
return;
}
if(softwareType === "measurement"){ switch (softwareType) {
const position = child.config.functionality.positionVsParent; case "measurement":
const distance = child.config.functionality.distanceVsParent || 0; this.logger.debug(`Registering measurement child...`);
const measurementType = child.config.asset.type; this._connectMeasurement(child);
const key = `${measurementType}_${position}`; break;
//rebuild to measurementype.variant no position and then switch based on values not strings or names. case "reactor":
const eventName = `${measurementType}.measured.${position}`; this.logger.debug(`Registering reactor child...`);
this._connectReactor(child);
break;
default:
this.logger.error(`Unrecognized softwareType: ${softwareType}`);
}
}
this.logger.debug(`Setting up listener for ${eventName} from child ${child.config.general.name}`); _connectMeasurement(measurementChild) {
// Register event listener for measurement updates const position = measurementChild.config.functionality.positionVsParent;
child.measurements.emitter.on(eventName, (eventData) => { const distance = measurementChild.config.functionality.distanceVsParent || 0;
this.logger.debug(`🔄 ${position} ${measurementType} from ${eventData.childName}: ${eventData.value} ${eventData.unit}`); const measurementType = measurementChild.config.asset.type;
//rebuild to measurementype.variant no position and then switch based on values not strings or names.
const eventName = `${measurementType}.measured.${position}`;
this.logger.debug(`Setting up listener for ${eventName} from child ${measurementChild.config.general.name}`);
// Register event listener for measurement updates
measurementChild.measurements.emitter.on(eventName, (eventData) => {
this.logger.debug(`🔄 ${position} ${measurementType} from ${eventData.childName}: ${eventData.value} ${eventData.unit}`);
// Store directly in parent's measurement container
this.measurements
.type(measurementType)
.variant("measured")
.position(position)
.value(eventData.value, eventData.timestamp, eventData.unit);
// Call the appropriate handler
console.log(` Emitting... ${eventName} with data:`); switch (measurementType) {
// Store directly in parent's measurement container case 'pressure':
this.measurements this.updateMeasuredPressure(eventData.value, position, eventData);
.type(measurementType) break;
.variant("measured")
.position(position)
.value(eventData.value, eventData.timestamp, eventData.unit);
// Call the appropriate handler case 'flow':
this._callMeasurementHandler(measurementType, eventData.value, position, eventData); this.updateMeasuredFlow(eventData.value, position, eventData);
}); break;
}
default:
this.logger.warn(`No handler for measurement type: ${measurementType}`);
// Generic handler - just update position
this.updatePosition();
}
});
} }
// Centralized handler dispatcher _connectReactor(reactorChild) {
_callMeasurementHandler(measurementType, value, position, context) { this.downstreamSink = reactorChild; // downstream from the pumps perpective
switch (measurementType) {
case 'pressure':
this.updateMeasuredPressure(value, position, context);
break;
case 'flow':
this.updateMeasuredFlow(value, position, context);
break;
default:
this.logger.warn(`No handler for measurement type: ${measurementType}`);
// Generic handler - just update position
this.updatePosition();
break;
} }
}
//---------------- END child stuff -------------// //---------------- END child stuff -------------//
// Method to assess drift using errorMetrics // Method to assess drift using errorMetrics
assessDrift(measurement, processMin, processMax) { assessDrift(measurement, processMin, processMax) {
this.logger.debug(`Assessing drift for measurement: ${measurement} processMin: ${processMin} processMax: ${processMax}`); this.logger.debug(`Assessing drift for measurement: ${measurement} processMin: ${processMin} processMax: ${processMax}`);
const predictedMeasurement = this.measurements.type(measurement).variant("predicted").position("downstream").getAllValues().values; const predictedMeasurement = this.measurements.type(measurement).variant("predicted").position("downstream").getAllValues().values;
const measuredMeasurement = this.measurements.type(measurement).variant("measured").position("downstream").getAllValues().values; const measuredMeasurement = this.measurements.type(measurement).variant("measured").position("downstream").getAllValues().values;
if (!predictedMeasurement || !measuredMeasurement) return null; if (!predictedMeasurement || !measuredMeasurement) return null;
return this.errorMetrics.assessDrift( return this.errorMetrics.assessDrift(
predictedMeasurement, predictedMeasurement,
measuredMeasurement, measuredMeasurement,
processMin, processMin,
processMax processMax
); );
} }
reverseCurve(curve) { reverseCurve(curve) {
const reversedCurve = {}; const reversedCurve = {};
@@ -485,12 +500,17 @@ _callMeasurementHandler(measurementType, value, position, context) {
// NEW: Flow handler // NEW: Flow handler
updateMeasuredFlow(value, position, context = {}) { updateMeasuredFlow(value, position, context = {}) {
if (!this._isOperationalState()) { if (!this._isOperationalState()) {
this.logger.warn(`Machine not operational, skipping flow update from ${context.childName || 'unknown'}`); this.logger.warn(`Machine not operational, skipping flow update from ${context.childName || 'unknown'}`);
return; return;
} }
this.logger.debug(`Flow update: ${value} at ${position} from ${context.childName || 'child'}`); this.logger.debug(`Flow update: ${value} at ${position} from ${context.childName || 'child'}`);
if (this.upstreamSource && this.downstreamSink) {
this._updateSourceSink();
}
// Store in parent's measurement container // Store in parent's measurement container
this.measurements.type("flow").variant("measured").position(position).value(value, context.timestamp, context.unit); this.measurements.type("flow").variant("measured").position(position).value(value, context.timestamp, context.unit);
@@ -501,6 +521,12 @@ _callMeasurementHandler(measurementType, value, position, context) {
} }
} }
_updateSourceSink() {
// Handles flow according to the configured "flow number"
this.logger.debug(`Updating source-sink pair: ${this.upstreamSource.config.functionality.softwareType} - ${this.downstreamSink.config.functionality.softwareType}`);
this.downstreamSink.setInfluent = this.upstreamSource.getEffluent[this.config.flowNumber];
}
// Helper method for operational state check // Helper method for operational state check
_isOperationalState() { _isOperationalState() {
const state = this.state.getCurrentState(); const state = this.state.getCurrentState();