bug fixes

rotatingMachine.html

@@ -24,6 +24,7 @@
           warmup: { value: 0 },
           shutdown: { value: 0 },
           cooldown: { value: 0 },
+          movementMode : { value: "staticspeed" }, // static or dynamic
           machineCurve : { value: {}},
 
           //define asset properties
@@ -54,7 +55,7 @@
     icon: "font-awesome/fa-cog",
 
     label: function () {
-      return this.positionIcon + " " + this.category.slice(0, -1) || "Machine";
+      return this.positionIcon + " " + this.category || "Machine";
     },
 
     oneditprepare: function() {
@@ -74,6 +75,10 @@
       document.getElementById("node-input-warmup");
       document.getElementById("node-input-shutdown");
       document.getElementById("node-input-cooldown");
+      const movementMode = document.getElementById("node-input-movementMode");
+      if (movementMode) {
+        movementMode.value = this.movementMode || "staticspeed";
+      }
 
     },
     oneditsave: function() {
@@ -99,6 +104,9 @@
         node[field] = value;
       });
 
+      node.movementMode = document.getElementById("node-input-movementMode").value;
+      console.log(`----------------> Saving movementMode: ${node.movementMode}`);
+      
     }
   });
 </script>
@@ -127,6 +135,13 @@
     <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-movementMode"><i class="fa fa-exchange"></i> Movement Mode</label>
+    <select id="node-input-movementMode" style="width:60%;">
+      <option value="staticspeed">Static</option>
+      <option value="dynspeed">Dynamic</option>
+    </select>
+  </div>
 
   <!-- Asset fields injected here -->
   <div id="asset-fields-placeholder"></div>

src/nodeClass.js

@@ -76,6 +76,8 @@ class nodeClass {
   _setupSpecificClass(uiConfig) {
     const machineConfig = this.config;
 
+    console.log(`----------------> Loaded movementMode in nodeClass: ${uiConfig.movementMode}`);
+    
     // need extra state for this
     const stateConfig = {
         general: {
@@ -85,7 +87,8 @@ class nodeClass {
           }
         },
         movement: {
-          speed: Number(uiConfig.speed)
+          speed: Number(uiConfig.speed),
+          mode: uiConfig.movementMode
         },
         time: {
           starting: Number(uiConfig.startup),

src/specificClass.js

@@ -1,6 +1,5 @@
 const EventEmitter = require('events');
 const {loadCurve,gravity,logger,configUtils,configManager,state, nrmse, MeasurementContainer, predict, interpolation , childRegistrationUtils,coolprop} = require('generalFunctions');
-const pressure = require('../../generalFunctions/src/convert/definitions/pressure');
 
 class Machine {
 
@@ -17,7 +16,7 @@ class Machine {
 
     // Load a specific curve
     this.model = machineConfig.asset.model; // Get the model from the machineConfig
-    this.curve = this.model ? loadCurve(this.model) : null;
+    this.curve = this.model ? loadCurve(this.model) : null; // we need to convert the curve and add units to the curve information
 
     //Init config and check if it is valid
     this.config = this.configUtils.initConfig(machineConfig);
@@ -35,10 +34,8 @@ class Machine {
     }
     else{
       this.hasCurve = true;
-          this.config = this.configUtils.updateConfig(this.config, { 
-      asset: { ...this.config.asset, machineCurve: this.curve } 
-    });
-      machineConfig = { ...machineConfig, asset: { ...machineConfig.asset, machineCurve: this.curve } }; // Merge curve into machineConfig
+      this.config = this.configUtils.updateConfig(this.config, { asset: { ...this.config.asset, machineCurve: this.curve } }); 
+      //machineConfig = { ...machineConfig, asset: { ...machineConfig.asset, machineCurve: this.curve } }; // Merge curve into machineConfig
       this.predictFlow = new predict({ curve: this.config.asset.machineCurve.nq });     // load nq (x : ctrl , y : flow relationship) 
       this.predictPower = new predict({ curve: this.config.asset.machineCurve.np });     // load np (x : ctrl , y : power relationship)
       this.predictCtrl = new predict({ curve: this.reverseCurve(this.config.asset.machineCurve.nq) }); // load reversed nq (x: flow, y: ctrl relationship)
@@ -99,13 +96,18 @@ class Machine {
     this.measurements.type('temperature').variant('measured').position('atEquipment').value(15).unit('C');
     //assume standard atm pressure is at sea level
     this.measurements.type('atmPressure').variant('measured').position('atEquipment').value(101325).unit('Pa');
+    //populate min and max
+    const flowunit = this.config.general.unit;
+    this.measurements.type('flow').variant('predicted').position('max').value(this.predictFlow.currentFxyYMax, Date.now() , flowunit) 
+    this.measurements.type('flow').variant('predicted').position('min').value(this.predictFlow.currentFxyYMin).unit(this.config.general.unit);
   }
 
   _updateState(){
     const isOperational = this._isOperationalState();
     if(!isOperational){
       //overrule the last prediction this should be 0 now
-      this.measurements.type("flow").variant("predicted").position("downstream").value(0);
+      this.measurements.type("flow").variant("predicted").position("downstream").value(0,Date.now(),this.config.general.unit);
+      this.measurements.type("flow").variant("predicted").position("atEquipment").value(0,Date.now(),this.config.general.unit);
     }
   }
 
@@ -127,7 +129,7 @@ class Machine {
           this.logger.debug(`🔄 ${position} ${measurementType} from ${eventData.childName}: ${eventData.value} ${eventData.unit}`);
       
 
-          console.log(` Emitting... ${eventName} with data:`);
+          this.logger.debug(` Emitting... ${eventName} with data:`);
           // Store directly in parent's measurement container
           this.measurements
             .type(measurementType)
@@ -346,21 +348,23 @@ _callMeasurementHandler(measurementType, value, position, context) {
   calcFlow(x) {
     if(this.hasCurve) {
       if (!this._isOperationalState()) {
-        this.measurements.type("flow").variant("predicted").position("downstream").value(0);
+        this.measurements.type("flow").variant("predicted").position("downstream").value(0,Date.now(),this.config.general.unit);
+        this.measurements.type("flow").variant("predicted").position("atEquipment").value(0,Date.now(),this.config.general.unit);
         this.logger.debug(`Machine is not operational. Setting predicted flow to 0.`);
         return 0;
       }
 
-      //this.predictFlow.currentX = x; Decrepated
       const cFlow = this.predictFlow.y(x);
-      this.measurements.type("flow").variant("predicted").position("downstream").value(cFlow);
+      this.measurements.type("flow").variant("predicted").position("downstream").value(cFlow,Date.now(),this.config.general.unit);
+      this.measurements.type("flow").variant("predicted").position("atEquipment").value(cFlow,Date.now(),this.config.general.unit);
       //this.logger.debug(`Calculated flow: ${cFlow} for pressure: ${this.getMeasuredPressure()} and position: ${x}`);
       return cFlow;
     }
 
     // If no curve data is available, log a warning and return 0
     this.logger.warn(`No curve data available for flow calculation. Returning 0.`);
-    this.measurements.type("flow").variant("predicted").position("downstream").value(0);
+    this.measurements.type("flow").variant("predicted").position("downstream").value(0, Date.now(),this.config.general.unit);
+    this.measurements.type("flow").variant("predicted").position("atEquipment").value(0, Date.now(),this.config.general.unit);
     return 0;
     
   }
@@ -425,6 +429,11 @@ _callMeasurementHandler(measurementType, value, position, context) {
   // returns the best available pressure measurement to use in the prediction calculation
   // this will be either the differential pressure, downstream or upstream pressure
   getMeasuredPressure() {
+    if(this.hasCurve === false){
+      this.logger.error(`No valid curve available to calculate prediction using last known pressure`);
+      return 0;
+    }
+    
     const pressureDiff = this.measurements.type('pressure').variant('measured').difference();
 
     // Both upstream & downstream => differential
@@ -473,6 +482,9 @@ _callMeasurementHandler(measurementType, value, position, context) {
           const efficiency = this.calcEfficiency(this.predictPower.outputY, this.predictFlow.outputY, "predicted");
           //update the distance from peak
           this.calcDistanceBEP(efficiency,cog,minEfficiency);
+          //place min and max flow capabilities in containerthis.predictFlow.currentFxyYMax - this.predictFlow.currentFxyYMin
+          this.measurements.type('flow').variant('predicted').position('max').value(this.predictFlow.currentFxyYMax).unit(this.config.general.unit);
+          this.measurements.type('flow').variant('predicted').position('min').value(this.predictFlow.currentFxyYMin).unit(this.config.general.unit);
     return 0;
   }
 
@@ -560,6 +572,7 @@ _callMeasurementHandler(measurementType, value, position, context) {
     // Update predicted flow if you have prediction capability
     if (this.predictFlow) {
       this.measurements.type("flow").variant("predicted").position("downstream").value(this.predictFlow.outputY || 0);
+      this.measurements.type("flow").variant("predicted").position("atEquipment").value(this.predictFlow.outputY || 0);
     }
   }
 
@@ -591,8 +604,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
 
     }
 
-    
-
   }
 
   calcDistanceFromPeak(currentEfficiency,peakEfficiency){
@@ -632,7 +643,7 @@ _callMeasurementHandler(measurementType, value, position, context) {
     const {efficiencyCurve, peak, peakIndex, minEfficiency } = this.calcEfficiencyCurve(powerCurve, flowCurve);
 
     // Calculate the normalized center of gravity
-    const NCog = (flowCurve.y[peakIndex] - this.predictFlow.currentFxyYMin) / (this.predictFlow.currentFxyYMax - this.predictFlow.currentFxyYMin);
+    const NCog = (flowCurve.y[peakIndex] - this.predictFlow.currentFxyYMin) / (this.predictFlow.currentFxyYMax - this.predictFlow.currentFxyYMin); //
 
     //store in object for later retrieval
     this.currentEfficiencyCurve = efficiencyCurve;
@@ -687,7 +698,9 @@ _callMeasurementHandler(measurementType, value, position, context) {
     const pressureDiff = this.measurements.type('pressure').variant('measured').difference('Pa');
     const g = gravity.getStandardGravity();
     const temp = this.measurements.type('temperature').variant('measured').position('atEquipment').getCurrentValue('K');
-    const atmPressure = this.measurements.type('atmPressure').variant('measured').position('atEquipment').getCurrentValue('Pa');    
+    const atmPressure = this.measurements.type('atmPressure').variant('measured').position('atEquipment').getCurrentValue('Pa');  
+    
+    console.log(`--------------------calc efficiency : Pressure diff:${pressureDiff},${temp}, ${g} `);
     const rho = coolprop.PropsSI('D', 'T', temp, 'P', atmPressure, 'WasteWater');
     
 
@@ -758,15 +771,8 @@ _callMeasurementHandler(measurementType, value, position, context) {
   getOutput() {
 
     // Improved output object generation
-    const output = {};
 
-    Object.entries(this.measurements.measurements).forEach(([type, variants]) => {
-      Object.entries(variants).forEach(([variant, positions]) => {
-        Object.entries(positions).forEach(([position, measurement]) => {
-          output[`${type}.${variant}.${position}`] = measurement.getCurrentValue();
-        });
-      });
-    });
+    const output = this.measurements.getFlattenedOutput();
 
     //fill in the rest of the output object
     output["state"] = this.state.getCurrentState();