test

rotatingMachine.html

@@ -1,13 +1,3 @@
-<!--
-| S88-niveau             | Primair (blokkleur) | Tekstkleur |
-| ---------------------- | ------------------- | ---------- |
-| **Area**               | `#0f52a5`           | wit        |
-| **Process Cell**       | `#0c99d9`           | wit        |
-| **Unit**               | `#50a8d9`           | zwart      |
-| **Equipment (Module)** | `#86bbdd`           | zwart      |
-| **Control Module**     | `#a9daee`           | zwart      |
-
--->
 <!-- Load the dynamic menu & config endpoints -->
 <script src="/rotatingMachine/menu.js"></script>
 <script src="/rotatingMachine/configData.js"></script>
@@ -15,7 +5,7 @@
 <script>
   RED.nodes.registerType("rotatingMachine", {
     category: "EVOLV",
-    color: "#86bbdd",
+    color: "#4f8582",
         defaults: {
 
           // Define specific properties
@@ -25,7 +15,6 @@
           shutdown: { value: 0 },
           cooldown: { value: 0 },
           machineCurve : { value: {}},
-          flowNumber: { value: 1, required: true },
 
           //define asset properties
           uuid: { value: "" },
@@ -52,7 +41,7 @@
     outputs: 3,
     inputLabels: ["Input"],
     outputLabels: ["process", "dbase", "parent"],
-    icon: "font-awesome/fa-cog",
+    icon: "font-awesome/fa-tachometer",
 
     label: function () {
       return this.positionIcon + " " + this.category.slice(0, -1) || "Machine";
@@ -128,10 +117,6 @@
     <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,8 +63,7 @@ class nodeClass {
       },
       functionality: {
         positionVsParent: uiConfig.positionVsParent
-      },
-      flowNumber: uiConfig.flowNumber
+      }
     };
 
     // Utility for formatting outputs
@@ -116,7 +115,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('upstream').getCurrentValue());
+          const power = Math.round(m.measurements.type("power").variant("predicted").position('atEquipment').getCurrentValue());
           let symbolState;
           switch(state){
             case "off":

src/specificClass.js

@@ -1,3 +1,48 @@
+/**
+ * @file machine.js
+ *
+ * Permission is hereby granted to any person obtaining a copy of this software 
+ * and associated documentation files (the "Software"), to use it for personal 
+ * or non-commercial purposes, with the following restrictions:
+ *
+ * 1. **No Copying or Redistribution**: The Software or any of its parts may not 
+ *    be copied, merged, distributed, sublicensed, or sold without explicit 
+ *    prior written permission from the author.
+ * 
+ * 2. **Commercial Use**: Any use of the Software for commercial purposes requires 
+ *    a valid license, obtainable only with the explicit consent of the author.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, 
+ * OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+ * SOFTWARE.
+ *
+ * Ownership of this code remainregisterChilds solely with the original author. Unauthorized 
+ * use of this Software is strictly prohibited.
+ *
+ * @summary A class to interact and manipulate machines with a non-euclidian curve
+ * @description A class to interact and manipulate machines with a non-euclidian curve
+ * @module machine
+ * @exports machine
+ * @version 0.1.0
+ * @since 0.1.0
+ * 
+ * Author:
+ * - Rene De Ren
+ * Email:
+ * - r.de.ren@brabantsedelta.nl
+ * 
+ *  Add functionality later
+  // -------- Operational Metrics -------- //
+maintenanceAlert: this.state.checkMaintenanceStatus()
+
+
+*/
+
+//load local dependencies
 const EventEmitter = require('events');
 const {loadCurve,logger,configUtils,configManager,state, nrmse, MeasurementContainer, predict, interpolation , childRegistrationUtils} = require('generalFunctions');
 const { name } = require('../../generalFunctions/src/convert/lodash/lodash._shimkeys');
@@ -68,10 +113,6 @@ 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
 
@@ -79,37 +120,23 @@ class Machine {
 
   /*-------------------               Register child events               -------------------*/
   registerChild(child, softwareType) {
-    if(!child) {
-      this.logger.error(`Invalid ${softwareType} child provided.`);
-      return;
-    }
+    this.logger.debug('Setting up child event for softwaretype ' + softwareType);
 
-    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}`);
-    }
-  }
-
-  _connectMeasurement(measurementChild) {
-    const position = measurementChild.config.functionality.positionVsParent;
-    const distance = measurementChild.config.functionality.distanceVsParent || 0;
-    const measurementType = measurementChild.config.asset.type;
+    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 ${measurementChild.config.general.name}`);
+          this.logger.debug(`Setting up listener for ${eventName} from child ${child.config.general.name}`);
           // Register event listener for measurement updates
-    measurementChild.measurements.emitter.on(eventName, (eventData) => {
+          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)
@@ -118,25 +145,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(eventData.value, position, eventData);
+      this.updateMeasuredPressure(value, position, context);
       break;
       
     case 'flow':
-          this.updateMeasuredFlow(eventData.value, position, eventData);
+      this.updateMeasuredFlow(value, position, context);
       break;
       
     default:
       this.logger.warn(`No handler for measurement type: ${measurementType}`);
       // Generic handler - just update position
       this.updatePosition();
+      break;
   }
-    });
-  }
-
-  _connectReactor(reactorChild) {
-    this.downstreamSink = reactorChild; // downstream from the pumps perpective
 }
 
 //---------------- END child stuff -------------//
@@ -483,12 +513,13 @@ class Machine {
     }
   }
 
-  // context handler for pressure updates
+  //  rich context handler for pressure updates
   updateMeasuredPressure(value, position, context = {}) {
    
+    //  Enhanced logging with child context
     this.logger.debug(`Pressure update: ${value} at ${position} from ${context.childName || 'child'} (${context.childId || 'unknown-id'})`);
     
-    //  Store in parent's measurement container 
+    //  Store in parent's measurement container (your existing logic)
     this.measurements.type("pressure").variant("measured").position(position).value(value, context.timestamp, context.unit);
 
     // Determine what kind of value to use as pressure (upstream , downstream or difference)
@@ -500,7 +531,6 @@ class Machine {
 
   // NEW: Flow handler
   updateMeasuredFlow(value, position, context = {}) {
-
     if (!this._isOperationalState()) {
       this.logger.warn(`Machine not operational, skipping flow update from ${context.childName || 'unknown'}`);
       return;
@@ -508,10 +538,6 @@ class Machine {
 
     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);
     
@@ -521,12 +547,6 @@ class Machine {
     }
   }
 
-  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();
@@ -751,9 +771,9 @@ class Machine {
 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');
@@ -769,7 +789,6 @@ const PT1 = new Child(config={
   },
   functionality:{
     softwareType:"measurement",
-    positionVsParent:"upstream",
   },
   asset:{
     supplier:"Vega",
@@ -791,7 +810,6 @@ const PT2 = new Child(config={
   },
   functionality:{
     softwareType:"measurement",
-    positionVsParent:"upstream",
   },
   asset:{
     supplier:"Vega",
@@ -807,18 +825,17 @@ console.log(`Creating machine...`);
 
 const machineConfig = {
   general: {
-      name: "Hydrostal",
+      name: "Hidrostal",
       logging: {
           enabled: true,
           logLevel: "debug",
       }
   },
   asset: {
-      supplier: "Hydrostal",
+      supplier: "Hidrostal",
       type: "pump",
       category: "centrifugal",
-      model: "H05K-S03R+HGM1X-X280KO", // Ensure this field is present.
-      machineCurve: curve["machineCurves"]["Hydrostal"]["H05K-S03R+HGM1X-X280KO"],
+      model: "hidrostal-H05K-S03R", // Ensure this field is present.
   }
 }
 
@@ -847,18 +864,17 @@ 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);
 
@@ -868,8 +884,8 @@ const tickLoop = setInterval(changeInput,1000);
 
 function changeInput(){
   PT1.logger.info(`tick...`);
-  PT1.tick();
-  PT2.tick();
+  //PT1.tick();
+  //PT2.tick();
 }
 
 async function testingSequences(){