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

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,72 +79,83 @@ 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"){
-          const position = child.config.functionality.positionVsParent;
-          const distance = child.config.functionality.distanceVsParent || 0;
-          const measurementType = child.config.asset.type;
-          const key = `${measurementType}_${position}`;
-          //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}`);
-          // Register event listener for measurement updates
-          child.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)
-            .variant("measured")
-            .position(position)
-            .value(eventData.value, eventData.timestamp, eventData.unit);
-          
-          // Call the appropriate handler
-          this._callMeasurementHandler(measurementType, eventData.value, position, eventData);
-      });
+    switch (softwareType) {
+      case "measurement":
+        this.logger.debug(`Registering measurement child...`);
+        this._connectMeasurement(child);
+        break;
+      case "reactor":
+        this.logger.debug(`Registering reactor child...`);
+        this._connectReactor(child);
+        break;
+      default:
+        this.logger.error(`Unrecognized softwareType: ${softwareType}`);
     }
   }
 
-// Centralized handler dispatcher
-_callMeasurementHandler(measurementType, value, position, context) {
-  switch (measurementType) {
-    case 'pressure':
-      this.updateMeasuredPressure(value, position, context);
-      break;
+  _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}`;
 
-    case 'flow':
-      this.updateMeasuredFlow(value, position, context);
-      break;
+    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}`);
 
-    default:
-      this.logger.warn(`No handler for measurement type: ${measurementType}`);
-      // Generic handler - just update position
-      this.updatePosition();
-      break;
+      // 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
+      switch (measurementType) {
+        case 'pressure':
+          this.updateMeasuredPressure(eventData.value, position, eventData);
+          break;
+          
+        case 'flow':
+          this.updateMeasuredFlow(eventData.value, position, eventData);
+          break;
+          
+        default:
+          this.logger.warn(`No handler for measurement type: ${measurementType}`);
+          // Generic handler - just update position
+          this.updatePosition();
+      }
+    });
   }
-}
 
-//---------------- END child stuff -------------//
+  _connectReactor(reactorChild) {
+    this.downstreamSink = reactorChild; // downstream from the pumps perpective
+  }
 
-    // Method to assess drift using errorMetrics
-    assessDrift(measurement, processMin, 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 measuredMeasurement = this.measurements.type(measurement).variant("measured").position("downstream").getAllValues().values;
+  //---------------- END child stuff -------------//
 
-      if (!predictedMeasurement || !measuredMeasurement) return null;
+  // Method to assess drift using errorMetrics
+  assessDrift(measurement, processMin, 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 measuredMeasurement = this.measurements.type(measurement).variant("measured").position("downstream").getAllValues().values;
 
-      return this.errorMetrics.assessDrift(
-        predictedMeasurement,
-        measuredMeasurement,
-        processMin,
-        processMax
-      );
-    }
+    if (!predictedMeasurement || !measuredMeasurement) return null;
+    
+    return this.errorMetrics.assessDrift(
+      predictedMeasurement,
+      measuredMeasurement,
+      processMin,
+      processMax
+    );
+  }
 
   reverseCurve(curve) {
     const reversedCurve = {};
@@ -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();