RnD/machineGroupControl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '85797b5' into HEAD

Browse Source 
# Conflicts:
#	src/nodeClass.js
#	src/specificClass.js
This commit is contained in:
znetsixe
2026-03-31 18:17:41 +02:00
parent b337bf9eb7 85797b5b8b
commit ffb2072baa
3 changed files with 203 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mgc.html
View File

@@ -18,6 +18,8 @@
defaults: { defaults: {
// Define default properties // Define default properties
name: { value: "" }, name: { value: "" },
processOutputFormat: { value: "process" },
dbaseOutputFormat: { value: "influxdb" },
// Logger properties // Logger properties
enableLog: { value: false }, enableLog: { value: false },
@@ -74,6 +76,24 @@
<script type="text/html" data-template-name="machineGroupControl"> <script type="text/html" data-template-name="machineGroupControl">
<h3>Output Formats</h3>
<div class="form-row">
<label for="node-input-processOutputFormat"><i class="fa fa-random"></i> Process Output</label>
<select id="node-input-processOutputFormat" style="width:60%;">
<option value="process">process</option>
<option value="json">json</option>
<option value="csv">csv</option>
</select>
</div>
<div class="form-row">
<label for="node-input-dbaseOutputFormat"><i class="fa fa-database"></i> Database Output</label>
<select id="node-input-dbaseOutputFormat" style="width:60%;">
<option value="influxdb">influxdb</option>
<option value="json">json</option>
<option value="csv">csv</option>
</select>
</div>
<!-- Logger fields injected here --> <!-- Logger fields injected here -->
<div id="logger-fields-placeholder"></div> <div id="logger-fields-placeholder"></div>

39
src/nodeClass.js
View File

@@ -39,21 +39,9 @@ class nodeClass {
this.defaultConfig = cfgMgr.getConfig(this.name); this.defaultConfig = cfgMgr.getConfig(this.name);
const flowUnit = this._resolveUnitOrFallback(uiConfig.unit, 'volumeFlowRate', 'm3/h', 'flow'); const flowUnit = this._resolveUnitOrFallback(uiConfig.unit, 'volumeFlowRate', 'm3/h', 'flow');
// Merge UI config over defaults // Build config: base sections (no domain-specific config for group controller)
this.config = { this.config = cfgMgr.buildConfig(this.name, uiConfig, node.id);
general: {
name: uiConfig.name,
id: node.id, // node.id is for the child registration process
unit: flowUnit,
logging: {
enabled: uiConfig.enableLog,
logLevel: uiConfig.logLevel,
},
},
functionality: {
positionVsParent: uiConfig.positionVsParent || "atEquipment", // Default to 'atEquipment' if not set
},
};
// Utility for formatting outputs // Utility for formatting outputs
this._output = new outputUtils(); this._output = new outputUtils();
} }
@@ -225,15 +213,27 @@ class nodeClass {
mg.logger.warn(`registerChild skipped: missing child/source for id=${childId}`); mg.logger.warn(`registerChild skipped: missing child/source for id=${childId}`);
break; break;
} }
mg.logger.debug(`Registering child: ${childId}, found: ${!!childObj}, source: ${!!childObj?.source}`);
mg.childRegistrationUtils.registerChild(childObj.source, msg.positionVsParent); mg.childRegistrationUtils.registerChild(childObj.source, msg.positionVsParent);
mg.logger.debug(`Total machines after registration: ${Object.keys(mg.machines || {}).length}`);
break; break;
} }
case "setMode":
mg.setMode(msg.payload); case "setMode": {
const mode = msg.payload;
mg.setMode(mode);
break; break;
case "setScaling": }
mg.setScaling(msg.payload);
case "setScaling": {
const scaling = msg.payload;
mg.setScaling(scaling);
break; break;
}
case "Qd": { case "Qd": {
const Qd = parseFloat(msg.payload); const Qd = parseFloat(msg.payload);
const sourceQd = "parent"; const sourceQd = "parent";
@@ -251,6 +251,7 @@ class nodeClass {
} }
break; break;
} }
default: default:
mg.logger.warn(`Unknown topic: ${msg.topic}`); mg.logger.warn(`Unknown topic: ${msg.topic}`);
break; break;

150
src/specificClass.js
View File

@@ -1,6 +1,6 @@
//load local dependencies //load local dependencies
const EventEmitter = require("events"); const EventEmitter = require("events");
const {logger,configUtils,configManager, MeasurementContainer, interpolation , childRegistrationUtils, convert} = require('generalFunctions'); const {logger,configUtils,configManager, MeasurementContainer, interpolation , childRegistrationUtils, convert, POSITIONS} = require('generalFunctions');
const CANONICAL_UNITS = Object.freeze({ const CANONICAL_UNITS = Object.freeze({
pressure: 'Pa', pressure: 'Pa',
@@ -123,7 +123,7 @@ class MachineGroup {
Object.values(this.machines).forEach(machine => { Object.values(this.machines).forEach(machine => {
const totals = { flow: { min: Infinity, max: 0 }, power: { min: Infinity, max: 0 } }; const totals = { flow: { min: Infinity, max: 0 }, power: { min: Infinity, max: 0 } };
//fetch min flow ever seen over all machines //fetch min flow ever seen over all machines
Object.entries(machine.predictFlow.inputCurve).forEach(([pressure, xyCurve], index) => { Object.entries(machine.predictFlow.inputCurve).forEach(([pressure, xyCurve], _index) => {
const minFlow = Math.min(...xyCurve.y); const minFlow = Math.min(...xyCurve.y);
const maxFlow = Math.max(...xyCurve.y); const maxFlow = Math.max(...xyCurve.y);
@@ -196,8 +196,8 @@ class MachineGroup {
const minPower = machine.predictPower.currentFxyYMin; const minPower = machine.predictPower.currentFxyYMin;
const maxPower = machine.predictPower.currentFxyYMax; const maxPower = machine.predictPower.currentFxyYMax;
const actFlow = this._readChildMeasurement(machine, "flow", "predicted", "atequipment", this.unitPolicy.canonical.flow) || 0; const actFlow = this._readChildMeasurement(machine, "flow", "predicted", POSITIONS.DOWNSTREAM, this.unitPolicy.canonical.flow) || 0;
const actPower = this._readChildMeasurement(machine, "power", "predicted", "atequipment", this.unitPolicy.canonical.power) || 0; const actPower = this._readChildMeasurement(machine, "power", "predicted", POSITIONS.AT_EQUIPMENT, this.unitPolicy.canonical.power) || 0;
this.logger.debug(`Machine ${machine.config.general.id} - Min Flow: ${minFlow}, Max Flow: ${maxFlow}, Min Power: ${minPower}, Max Power: ${maxPower}, NCog: ${machine.NCog}`); this.logger.debug(`Machine ${machine.config.general.id} - Min Flow: ${minFlow}, Max Flow: ${maxFlow}, Min Power: ${minPower}, Max Power: ${maxPower}, NCog: ${machine.NCog}`);
@@ -251,11 +251,11 @@ class MachineGroup {
const { flow, power } = this.calcDynamicTotals(); const { flow, power } = this.calcDynamicTotals();
this.logger.debug(`Dynamic Totals after pressure change - Flow: Min ${flow.min}, Max ${flow.max}, Act ${flow.act} | Power: Min ${power.min}, Max ${power.max}, Act ${power.act}`); this.logger.debug(`Dynamic Totals after pressure change - Flow: Min ${flow.min}, Max ${flow.max}, Act ${flow.act} | Power: Min ${power.min}, Max ${power.max}, Act ${power.act}`);
this._writeMeasurement("flow", "predicted", "atequipment", flow.act, this.unitPolicy.canonical.flow); this._writeMeasurement("flow", "predicted", POSITIONS.AT_EQUIPMENT, flow.act, this.unitPolicy.canonical.flow);
this._writeMeasurement("power", "predicted", "atequipment", power.act, this.unitPolicy.canonical.power); this._writeMeasurement("power", "predicted", POSITIONS.AT_EQUIPMENT, power.act, this.unitPolicy.canonical.power);
const { maxEfficiency, lowestEfficiency } = this.calcGroupEfficiency(this.machines); const { maxEfficiency, lowestEfficiency } = this.calcGroupEfficiency(this.machines);
const efficiency = this.measurements.type("efficiency").variant("predicted").position("atequipment").getCurrentValue(); const efficiency = this.measurements.type("efficiency").variant("predicted").position(POSITIONS.AT_EQUIPMENT).getCurrentValue();
this.calcDistanceBEP(efficiency,maxEfficiency,lowestEfficiency); this.calcDistanceBEP(efficiency,maxEfficiency,lowestEfficiency);
} }
@@ -291,8 +291,8 @@ class MachineGroup {
//add special cases //add special cases
if( state === "operational" && ( mode == "virtualControl" || mode === "fysicalControl") ){ if( state === "operational" && ( mode == "virtualControl" || mode === "fysicalControl") ){
let flow = 0; let flow = 0;
const measuredFlow = this._readChildMeasurement(machine, "flow", "measured", "downstream", this.unitPolicy.canonical.flow); const measuredFlow = this._readChildMeasurement(machine, "flow", "measured", POSITIONS.DOWNSTREAM, this.unitPolicy.canonical.flow);
const predictedFlow = this._readChildMeasurement(machine, "flow", "predicted", "atequipment", this.unitPolicy.canonical.flow); const predictedFlow = this._readChildMeasurement(machine, "flow", "predicted", POSITIONS.DOWNSTREAM, this.unitPolicy.canonical.flow);
if (Number.isFinite(measuredFlow) && measuredFlow !== 0) { if (Number.isFinite(measuredFlow) && measuredFlow !== 0) {
flow = measuredFlow; flow = measuredFlow;
} }
@@ -647,10 +647,10 @@ class MachineGroup {
try{ try{
//we need to force the pressures of all machines to be equal to the highest pressure measured in the group //we need to force the pressures of all machines to be equal to the highest pressure measured in the group
// this is to ensure a correct evaluation of the flow and power consumption // this is to ensure a correct evaluation of the flow and power consumption
const pressures = Object.entries(this.machines).map(([machineId, machine]) => { const pressures = Object.entries(this.machines).map(([_machineId, machine]) => {
return { return {
downstream: this._readChildMeasurement(machine, "pressure", "measured", "downstream", this.unitPolicy.canonical.pressure), downstream: this._readChildMeasurement(machine, "pressure", "measured", POSITIONS.DOWNSTREAM, this.unitPolicy.canonical.pressure),
upstream: this._readChildMeasurement(machine, "pressure", "measured", "upstream", this.unitPolicy.canonical.pressure) upstream: this._readChildMeasurement(machine, "pressure", "measured", POSITIONS.UPSTREAM, this.unitPolicy.canonical.pressure)
}; };
}); });
@@ -660,12 +660,12 @@ class MachineGroup {
this.logger.debug(`Max downstream pressure: ${maxDownstream}, Min upstream pressure: ${minUpstream}`); this.logger.debug(`Max downstream pressure: ${maxDownstream}, Min upstream pressure: ${minUpstream}`);
//set the pressures //set the pressures
Object.entries(this.machines).forEach(([machineId, machine]) => { Object.entries(this.machines).forEach(([_machineId, machine]) => {
if(machine.state.getCurrentState() !== "operational" && machine.state.getCurrentState() !== "accelerating" && machine.state.getCurrentState() !== "decelerating"){ if(machine.state.getCurrentState() !== "operational" && machine.state.getCurrentState() !== "accelerating" && machine.state.getCurrentState() !== "decelerating"){
//Equilize pressures over all machines so we can make a proper calculation //Equilize pressures over all machines so we can make a proper calculation
this._writeChildMeasurement(machine, "pressure", "measured", "downstream", maxDownstream, this.unitPolicy.canonical.pressure); this._writeChildMeasurement(machine, "pressure", "measured", POSITIONS.DOWNSTREAM, maxDownstream, this.unitPolicy.canonical.pressure);
this._writeChildMeasurement(machine, "pressure", "measured", "upstream", minUpstream, this.unitPolicy.canonical.pressure); this._writeChildMeasurement(machine, "pressure", "measured", POSITIONS.UPSTREAM, minUpstream, this.unitPolicy.canonical.pressure);
// after updating the measurement directly we need to force the update of the value OLIFANT this is not so clear now in the code // after updating the measurement directly we need to force the update of the value OLIFANT this is not so clear now in the code
// we need to find a better way to do this but for now it works // we need to find a better way to do this but for now it works
@@ -728,10 +728,10 @@ class MachineGroup {
this.logger.debug(`Moving to demand: ${Qd.toFixed(2)} -> Pumps: [${debugInfo}] => Total Power: ${bestResult.bestPower.toFixed(2)}`); this.logger.debug(`Moving to demand: ${Qd.toFixed(2)} -> Pumps: [${debugInfo}] => Total Power: ${bestResult.bestPower.toFixed(2)}`);
//store the total delivered power //store the total delivered power
this._writeMeasurement("power", "predicted", "atequipment", bestResult.bestPower, this.unitPolicy.canonical.power); this._writeMeasurement("power", "predicted", POSITIONS.AT_EQUIPMENT, bestResult.bestPower, this.unitPolicy.canonical.power);
this._writeMeasurement("flow", "predicted", "atequipment", bestResult.bestFlow, this.unitPolicy.canonical.flow); this._writeMeasurement("flow", "predicted", POSITIONS.DOWNSTREAM, bestResult.bestFlow, this.unitPolicy.canonical.flow);
this.measurements.type("efficiency").variant("predicted").position("atequipment").value(bestResult.bestFlow / bestResult.bestPower); this.measurements.type("efficiency").variant("predicted").position(POSITIONS.AT_EQUIPMENT).value(bestResult.bestFlow / bestResult.bestPower);
this.measurements.type("Ncog").variant("predicted").position("atequipment").value(bestResult.bestCog); this.measurements.type("Ncog").variant("predicted").position(POSITIONS.AT_EQUIPMENT).value(bestResult.bestCog);
await Promise.all(Object.entries(this.machines).map(async ([machineId, machine]) => { await Promise.all(Object.entries(this.machines).map(async ([machineId, machine]) => {
// Find the flow for this machine in the best combination // Find the flow for this machine in the best combination
@@ -767,10 +767,10 @@ class MachineGroup {
// Equalize pressure across all machines for machines that are not running. This is needed to ensure accurate flow and power predictions. // Equalize pressure across all machines for machines that are not running. This is needed to ensure accurate flow and power predictions.
equalizePressure(){ equalizePressure(){
// Get current pressures from all machines // Get current pressures from all machines
const pressures = Object.entries(this.machines).map(([machineId, machine]) => { const pressures = Object.entries(this.machines).map(([_machineId, machine]) => {
return { return {
downstream: this._readChildMeasurement(machine, "pressure", "measured", "downstream", this.unitPolicy.canonical.pressure), downstream: this._readChildMeasurement(machine, "pressure", "measured", POSITIONS.DOWNSTREAM, this.unitPolicy.canonical.pressure),
upstream: this._readChildMeasurement(machine, "pressure", "measured", "upstream", this.unitPolicy.canonical.pressure) upstream: this._readChildMeasurement(machine, "pressure", "measured", POSITIONS.UPSTREAM, this.unitPolicy.canonical.pressure)
}; };
}); });
@@ -781,8 +781,8 @@ class MachineGroup {
// Set consistent pressures across machines // Set consistent pressures across machines
Object.entries(this.machines).forEach(([machineId, machine]) => { Object.entries(this.machines).forEach(([machineId, machine]) => {
if(!this.isMachineActive(machineId)){ if(!this.isMachineActive(machineId)){
this._writeChildMeasurement(machine, "pressure", "measured", "downstream", maxDownstream, this.unitPolicy.canonical.pressure); this._writeChildMeasurement(machine, "pressure", "measured", POSITIONS.DOWNSTREAM, maxDownstream, this.unitPolicy.canonical.pressure);
this._writeChildMeasurement(machine, "pressure", "measured", "upstream", minUpstream, this.unitPolicy.canonical.pressure); this._writeChildMeasurement(machine, "pressure", "measured", POSITIONS.UPSTREAM, minUpstream, this.unitPolicy.canonical.pressure);
// Update the measured pressure value // Update the measured pressure value
const pressure = machine.getMeasuredPressure(); const pressure = machine.getMeasuredPressure();
this.logger.debug(`Setting pressure for machine ${machineId} to ${pressure}`); this.logger.debug(`Setting pressure for machine ${machineId} to ${pressure}`);
@@ -826,7 +826,7 @@ class MachineGroup {
} }
filterOutUnavailableMachines(list) { filterOutUnavailableMachines(list) {
const newList = list.filter(({ id, machine }) => { const newList = list.filter(({ machine }) => {
const state = machine.state.getCurrentState(); const state = machine.state.getCurrentState();
const validActionForMode = machine.isValidActionForMode("execsequence", "auto"); const validActionForMode = machine.isValidActionForMode("execsequence", "auto");
@@ -841,7 +841,7 @@ class MachineGroup {
let lowestEfficiency = Infinity; let lowestEfficiency = Infinity;
// Calculate the average efficiency of all machines -> peak is the average of them all // Calculate the average efficiency of all machines -> peak is the average of them all
Object.entries(machines).forEach(([machineId, machine]) => { Object.entries(machines).forEach(([_machineId, machine]) => {
cumEfficiency += machine.cog; cumEfficiency += machine.cog;
if(machine.cog < lowestEfficiency){ if(machine.cog < lowestEfficiency){
lowestEfficiency = machine.cog; lowestEfficiency = machine.cog;
@@ -856,7 +856,7 @@ class MachineGroup {
} }
//move machines assuming equal control in flow and a priority list //move machines assuming equal control in flow and a priority list
async equalFlowControl(Qd, powerCap = Infinity, priorityList = null) { async equalFlowControl(Qd, _powerCap = Infinity, priorityList = null) {
try { try {
// equalize pressure across all machines // equalize pressure across all machines
@@ -911,7 +911,7 @@ class MachineGroup {
break; break;
} }
case (Qd > activeTotals.flow.max): case (Qd > activeTotals.flow.max): {
// Case 2: Demand is above the maximum available flow. // Case 2: Demand is above the maximum available flow.
// Start the non-active machine with the highest priority and distribute Qd over all available machines. // Start the non-active machine with the highest priority and distribute Qd over all available machines.
let i = 1; let i = 1;
@@ -931,9 +931,10 @@ class MachineGroup {
} }
break; break;
}
default: default: {
// Default case: Demand is within the active range. // Default case: Demand is within the active range.
const countActiveMachines = machinesInPriorityOrder.filter(({ id }) => this.isMachineActive(id)).length; const countActiveMachines = machinesInPriorityOrder.filter(({ id }) => this.isMachineActive(id)).length;
@@ -947,6 +948,7 @@ class MachineGroup {
} }
break; break;
}
} }
// Log information about flow distribution // Log information about flow distribution
@@ -958,10 +960,10 @@ class MachineGroup {
this.logger.debug(`Priority control for demand: ${totalFlow.toFixed(2)} -> Active pumps: [${debugInfo}] => Total Power: ${totalPower.toFixed(2)}`); this.logger.debug(`Priority control for demand: ${totalFlow.toFixed(2)} -> Active pumps: [${debugInfo}] => Total Power: ${totalPower.toFixed(2)}`);
// Store measurements // Store measurements
this._writeMeasurement("power", "predicted", "atequipment", totalPower, this.unitPolicy.canonical.power); this._writeMeasurement("power", "predicted", POSITIONS.AT_EQUIPMENT, totalPower, this.unitPolicy.canonical.power);
this._writeMeasurement("flow", "predicted", "atequipment", totalFlow, this.unitPolicy.canonical.flow); this._writeMeasurement("flow", "predicted", POSITIONS.DOWNSTREAM, totalFlow, this.unitPolicy.canonical.flow);
this.measurements.type("efficiency").variant("predicted").position("atequipment").value(totalFlow / totalPower); this.measurements.type("efficiency").variant("predicted").position(POSITIONS.AT_EQUIPMENT).value(totalFlow / totalPower);
this.measurements.type("Ncog").variant("predicted").position("atequipment").value(totalCog); this.measurements.type("Ncog").variant("predicted").position(POSITIONS.AT_EQUIPMENT).value(totalCog);
this.logger.debug(`Flow distribution: ${JSON.stringify(flowDistribution)}`); this.logger.debug(`Flow distribution: ${JSON.stringify(flowDistribution)}`);
// Apply the flow distribution to machines // Apply the flow distribution to machines
@@ -999,7 +1001,7 @@ class MachineGroup {
} }
//capp input to 100 //capp input to 100
input > 100 ? input = 100 : input = input; if (input > 100) { input = 100; }
const numOfMachines = Object.keys(this.machines).length; const numOfMachines = Object.keys(this.machines).length;
const procentTotal = numOfMachines * input; const procentTotal = numOfMachines * input;
@@ -1013,7 +1015,7 @@ class MachineGroup {
if(machinesNeeded > machinesActive){ if(machinesNeeded > machinesActive){
//start extra machine and put all active machines at min control //start extra machine and put all active machines at min control
machinesInPriorityOrder.forEach(({ id, machine }, index) => { machinesInPriorityOrder.forEach(({ id }, index) => {
if(index < machinesNeeded){ if(index < machinesNeeded){
ctrlDistribution.push({machineId : id, ctrl : 0}); ctrlDistribution.push({machineId : id, ctrl : 0});
} }
@@ -1022,7 +1024,7 @@ class MachineGroup {
if(machinesNeeded < machinesActive){ if(machinesNeeded < machinesActive){
machinesInPriorityOrder.forEach(({ id, machine }, index) => { machinesInPriorityOrder.forEach(({ id }, index) => {
if(this.isMachineActive(id)){ if(this.isMachineActive(id)){
if(index < machinesNeeded){ if(index < machinesNeeded){
ctrlDistribution.push({machineId : id, ctrl : 100}); ctrlDistribution.push({machineId : id, ctrl : 100});
@@ -1039,7 +1041,7 @@ class MachineGroup {
// distribute input equally among active machines (0 - 100%) // distribute input equally among active machines (0 - 100%)
const ctrlPerMachine = procentTotal / machinesActive; const ctrlPerMachine = procentTotal / machinesActive;
machinesInPriorityOrder.forEach(({ id, machine }) => { machinesInPriorityOrder.forEach(({ id }) => {
if (this.isMachineActive(id)) { if (this.isMachineActive(id)) {
// ensure ctrl is capped between 0 and 100% // ensure ctrl is capped between 0 and 100%
const ctrlValue = Math.max(0, Math.min(ctrlPerMachine, 100)); const ctrlValue = Math.max(0, Math.min(ctrlPerMachine, 100));
@@ -1071,10 +1073,10 @@ class MachineGroup {
const totalFlow = []; const totalFlow = [];
// fetch and store measurements // fetch and store measurements
Object.entries(this.machines).forEach(([machineId, machine]) => { Object.entries(this.machines).forEach(([_machineId, machine]) => {
const powerValue = this._readChildMeasurement(machine, "power", "predicted", "atequipment", this.unitPolicy.canonical.power); const powerValue = this._readChildMeasurement(machine, "power", "predicted", POSITIONS.AT_EQUIPMENT, this.unitPolicy.canonical.power);
const flowValue = this._readChildMeasurement(machine, "flow", "predicted", "atequipment", this.unitPolicy.canonical.flow); const flowValue = this._readChildMeasurement(machine, "flow", "predicted", POSITIONS.DOWNSTREAM, this.unitPolicy.canonical.flow);
if (powerValue !== null) { if (powerValue !== null) {
totalPower.push(powerValue); totalPower.push(powerValue);
@@ -1084,11 +1086,11 @@ class MachineGroup {
} }
}); });
this._writeMeasurement("power", "predicted", "atequipment", totalPower.reduce((a, b) => a + b, 0), this.unitPolicy.canonical.power); this._writeMeasurement("power", "predicted", POSITIONS.AT_EQUIPMENT, totalPower.reduce((a, b) => a + b, 0), this.unitPolicy.canonical.power);
this._writeMeasurement("flow", "predicted", "atequipment", totalFlow.reduce((a, b) => a + b, 0), this.unitPolicy.canonical.flow); this._writeMeasurement("flow", "predicted", POSITIONS.DOWNSTREAM, totalFlow.reduce((a, b) => a + b, 0), this.unitPolicy.canonical.flow);
if(totalPower.reduce((a, b) => a + b, 0) > 0){ if(totalPower.reduce((a, b) => a + b, 0) > 0){
this.measurements.type("efficiency").variant("predicted").position("atequipment").value(totalFlow.reduce((a, b) => a + b, 0) / totalPower.reduce((a, b) => a + b, 0)); this.measurements.type("efficiency").variant("predicted").position(POSITIONS.AT_EQUIPMENT).value(totalFlow.reduce((a, b) => a + b, 0) / totalPower.reduce((a, b) => a + b, 0));
} }
} }
@@ -1124,12 +1126,12 @@ class MachineGroup {
return; return;
} }
if (demandQ < absoluteTotals.flow.min) { if (demandQ < this.absoluteTotals.flow.min) {
this.logger.warn(`Flow demand ${demandQ} is below minimum possible flow ${absoluteTotals.flow.min}. Capping to minimum flow.`); this.logger.warn(`Flow demand ${demandQ} is below minimum possible flow ${this.absoluteTotals.flow.min}. Capping to minimum flow.`);
demandQout = this.absoluteTotals.flow.min; demandQout = this.absoluteTotals.flow.min;
} else if (demandQout > absoluteTotals.flow.max) { } else if (demandQout > this.absoluteTotals.flow.max) {
this.logger.warn(`Flow demand ${demandQ} is above maximum possible flow ${absoluteTotals.flow.max}. Capping to maximum flow.`); this.logger.warn(`Flow demand ${demandQ} is above maximum possible flow ${this.absoluteTotals.flow.max}. Capping to maximum flow.`);
demandQout = absoluteTotals.flow.max; demandQout = this.absoluteTotals.flow.max;
}else if(demandQout <= 0){ }else if(demandQout <= 0){
this.logger.debug(`Turning machines off`); this.logger.debug(`Turning machines off`);
demandQout = 0; demandQout = 0;
@@ -1185,7 +1187,7 @@ class MachineGroup {
//recalc distance from BEP //recalc distance from BEP
const { maxEfficiency, lowestEfficiency } = this.calcGroupEfficiency(this.machines); const { maxEfficiency, lowestEfficiency } = this.calcGroupEfficiency(this.machines);
const efficiency = this.measurements.type("efficiency").variant("predicted").position("downstream").getCurrentValue(); const efficiency = this.measurements.type("efficiency").variant("predicted").position(POSITIONS.AT_EQUIPMENT).getCurrentValue();
this.calcDistanceBEP(efficiency,maxEfficiency,lowestEfficiency); this.calcDistanceBEP(efficiency,maxEfficiency,lowestEfficiency);
} }
@@ -1306,32 +1308,32 @@ class MachineGroup {
const output = {}; const output = {};
//build the output object //build the output object
Object.entries(this.measurements.measurements || {}).forEach(([type, variants]) => { this.measurements.getTypes().forEach(type => {
Object.keys(variants || {}).forEach((variant) => { this.measurements.getVariants(type).forEach(variant => {
const unit = this._outputUnitForType(type); const unit = this._outputUnitForType(type);
const downstreamVal = this._readMeasurement(type, variant, "downstream", unit); const downstreamVal = this._readMeasurement(type, variant, POSITIONS.DOWNSTREAM, unit);
const atEquipmentVal = this._readMeasurement(type, variant, "atequipment", unit); const atEquipmentVal = this._readMeasurement(type, variant, POSITIONS.AT_EQUIPMENT, unit);
const upstreamVal = this._readMeasurement(type, variant, "upstream", unit); const upstreamVal = this._readMeasurement(type, variant, POSITIONS.UPSTREAM, unit);
if (downstreamVal != null) { if (downstreamVal != null) {
output[`downstream_${variant}_${type}`] = downstreamVal; output[`downstream_${variant}_${type}`] = downstreamVal;
} }
if (upstreamVal != null) { if (upstreamVal != null) {
output[`upstream_${variant}_${type}`] = upstreamVal; output[`upstream_${variant}_${type}`] = upstreamVal;
} }
if (atEquipmentVal != null) { if (atEquipmentVal != null) {
output[`atequipment${variant}_${type}`] = atEquipmentVal; output[`atEquipment_${variant}_${type}`] = atEquipmentVal;
} }
if (downstreamVal != null && upstreamVal != null) { if (downstreamVal != null && upstreamVal != null) {
const diff = this.measurements const diff = this.measurements
.type(type) .type(type)
.variant(variant) .variant(variant)
.difference({ from: 'downstream', to: 'upstream', unit }); .difference({ from: POSITIONS.DOWNSTREAM, to: POSITIONS.UPSTREAM, unit });
if (diff?.value != null) { if (diff?.value != null) {
output[`differential_${variant}_${type}`] = diff.value; output[`differential_${variant}_${type}`] = diff.value;
} }
} }
}); });
}); });
//fill in the rest of the output object //fill in the rest of the output object