Rename _updateSourceSink to updateSourceSink for outside access

Reviewed-on: RnD/rotatingMachine#4

rotatingMachine.html

@@ -24,7 +24,8 @@
           warmup: { value: 0 },
           shutdown: { value: 0 },
           cooldown: { value: 0 },
-          machineCurve : { value: {}},
+          machineCurve: { value: {}},
+          flowNumber: { value: 1, required: true },
 
           //define asset properties
           uuid: { value: "" },
@@ -127,6 +128,10 @@
     <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%;" />
   </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 -->
   <div id="asset-fields-placeholder"></div>

src/nodeClass.js

@@ -63,7 +63,8 @@ class nodeClass {
       },
       functionality: {
         positionVsParent: uiConfig.positionVsParent
-      }
+      },
+      flowNumber: uiConfig.flowNumber
     };
 
     // Utility for formatting outputs
@@ -115,7 +116,7 @@ class nodeClass {
           const mode = m.currentMode;
           const state = m.state.getCurrentState();
           const flow = Math.round(m.measurements.type("flow").variant("predicted").position('downstream').getCurrentValue());
-          const power = Math.round(m.measurements.type("power").variant("predicted").position('atEquipment').getCurrentValue());
+          const power = Math.round(m.measurements.type("power").variant("predicted").position('upstream').getCurrentValue());
           let symbolState;
           switch(state){
             case "off":

src/specificClass.js

@@ -68,6 +68,10 @@ class Machine {
       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.childRegistrationUtils = new childRegistrationUtils(this); // Child registration utility
 
@@ -75,23 +79,37 @@ class Machine {
 
   /*-------------------               Register child events               -------------------*/
   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;
+      case "reactor":
+        this.logger.debug(`Registering reactor child...`);
+        this._connectReactor(child);
+        break;
+      default:
+        this.logger.error(`Unrecognized softwareType: ${softwareType}`);
+    }
+  }
+
+  _connectMeasurement(measurementChild) {
+    const position = measurementChild.config.functionality.positionVsParent;
+    const distance = measurementChild.config.functionality.distanceVsParent || 0;
+    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 ${child.config.general.name}`);
+    this.logger.debug(`Setting up listener for ${eventName} from child ${measurementChild.config.general.name}`);
     // Register event listener for measurement updates
-          child.measurements.emitter.on(eventName, (eventData) => {
+    measurementChild.measurements.emitter.on(eventName, (eventData) => {
       this.logger.debug(`🔄 ${position} ${measurementType} from ${eventData.childName}: ${eventData.value} ${eventData.unit}`);
 
-
-          console.log(` Emitting... ${eventName} with data:`);
       // Store directly in parent's measurement container
       this.measurements
         .type(measurementType)
@@ -100,31 +118,28 @@ class Machine {
         .value(eventData.value, eventData.timestamp, eventData.unit);      
       
       // Call the appropriate handler
-          this._callMeasurementHandler(measurementType, eventData.value, position, eventData);
-      });
-    }
-  }
-
-// Centralized handler dispatcher
-_callMeasurementHandler(measurementType, value, position, context) {
       switch (measurementType) {
         case 'pressure':
-      this.updateMeasuredPressure(value, position, context);
+          this.updateMeasuredPressure(eventData.value, position, eventData);
           break;
           
         case 'flow':
-      this.updateMeasuredFlow(value, position, context);
+          this.updateMeasuredFlow(eventData.value, position, eventData);
           break;
           
         default:
           this.logger.warn(`No handler for measurement type: ${measurementType}`);
           // Generic handler - just update position
           this.updatePosition();
-      break;
       }
-}
+    });
+  }
 
-//---------------- END child stuff -------------//
+  _connectReactor(reactorChild) {
+    this.downstreamSink = reactorChild; // downstream from the pumps perpective
+  }
+
+  //---------------- END child stuff -------------//
 
   // Method to assess drift using errorMetrics
   assessDrift(measurement, processMin, processMax) {
@@ -485,6 +500,7 @@ _callMeasurementHandler(measurementType, value, position, context) {
 
   // NEW: Flow handler
   updateMeasuredFlow(value, position, context = {}) {
+
     if (!this._isOperationalState()) {
       this.logger.warn(`Machine not operational, skipping flow update from ${context.childName || 'unknown'}`);
       return;
@@ -492,6 +508,10 @@ _callMeasurementHandler(measurementType, value, position, context) {
 
     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
     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
   _isOperationalState() {
     const state = this.state.getCurrentState();
@@ -725,9 +751,9 @@ _callMeasurementHandler(measurementType, value, position, context) {
 module.exports = Machine;
 
 /*-------------------               Testing               -------------------*/
-
 /*
-//curve = require('C:/Users/zn375/.node-red/public/fallbackData.json');
+
+curve = require('C:/Users/zn375/.node-red/public/fallbackData.json');
 
 //import a child
 const Child = require('../../measurement/src/specificClass');
@@ -743,6 +769,7 @@ const PT1 = new Child(config={
   },
   functionality:{
     softwareType:"measurement",
+    positionVsParent:"upstream",
   },
   asset:{
     supplier:"Vega",
@@ -764,6 +791,7 @@ const PT2 = new Child(config={
   },
   functionality:{
     softwareType:"measurement",
+    positionVsParent:"upstream",
   },
   asset:{
     supplier:"Vega",
@@ -779,17 +807,18 @@ console.log(`Creating machine...`);
 
 const machineConfig = {
   general: {
-      name: "Hidrostal",
+      name: "Hydrostal",
       logging: {
           enabled: true,
           logLevel: "debug",
       }
   },
   asset: {
-      supplier: "Hidrostal",
+      supplier: "Hydrostal",
       type: "pump",
       category: "centrifugal",
-      model: "hidrostal-H05K-S03R", // Ensure this field is present.
+      model: "H05K-S03R+HGM1X-X280KO", // Ensure this field is present.
+      machineCurve: curve["machineCurves"]["Hydrostal"]["H05K-S03R+HGM1X-X280KO"],
   }
 }
 
@@ -818,17 +847,18 @@ const machine = new Machine(machineConfig, stateConfig);
 machine.logger.info(`Registering child...`);
 machine.childRegistrationUtils.registerChild(PT1, "upstream");
 machine.childRegistrationUtils.registerChild(PT2, "downstream");
-/*
+
+//feed curve to the machine class
+//machine.updateCurve(curve["machineCurves"]["Hydrostal"]["H05K-S03R+HGM1X-X280KO"]);
+
 PT1.logger.info(`Enable sim...`);
 PT1.toggleSimulation();
 PT2.logger.info(`Enable sim...`);
 PT2.toggleSimulation();
-*/
+machine.getOutput();
-
-
 //manual test
 //machine.handleInput("parent", "execSequence", "startup");
-/*
+
 machine.measurements.type("pressure").variant("measured").position('upstream').value(-200);
 machine.measurements.type("pressure").variant("measured").position('downstream').value(1000);
 
@@ -838,8 +868,8 @@ const tickLoop = setInterval(changeInput,1000);
 
 function changeInput(){
   PT1.logger.info(`tick...`);
-  //PT1.tick();
+  PT1.tick();
-  //PT2.tick();
+  PT2.tick();
 }
 
 async function testingSequences(){