test

Reviewed-on: #1

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
@@ -24,7 +14,6 @@
           warmup: { value: 0 },
           shutdown: { value: 0 },
           cooldown: { value: 0 },
-          movementMode : { value: "staticspeed" }, // static or dynamic
           machineCurve : { value: {}},
 
           //define asset properties
@@ -52,10 +41,10 @@
     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 || "Machine";
+      return this.positionIcon + " " + this.category.slice(0, -1) || "Machine";
     },
 
     oneditprepare: function() {
@@ -75,10 +64,6 @@
       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() {
@@ -104,9 +89,6 @@
         node[field] = value;
       });
 
-      node.movementMode = document.getElementById("node-input-movementMode").value;
-      console.log(`----------------> Saving movementMode: ${node.movementMode}`);
-      
     }
   });
 </script>
@@ -135,13 +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-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,8 +76,6 @@ class nodeClass {
   _setupSpecificClass(uiConfig) {
     const machineConfig = this.config;
 
-    console.log(`----------------> Loaded movementMode in nodeClass: ${uiConfig.movementMode}`);
-    
     // need extra state for this
     const stateConfig = {
         general: {
@@ -87,8 +85,7 @@ class nodeClass {
           }
         },
         movement: {
-          speed: Number(uiConfig.speed),
-          mode: uiConfig.movementMode
+          speed: Number(uiConfig.speed)
         },
         time: {
           starting: Number(uiConfig.startup),
@@ -117,8 +114,8 @@ class nodeClass {
     try {
           const mode = m.currentMode;
           const state = m.state.getCurrentState();
-          const flow = Math.round(m.measurements.type("flow").variant("predicted").position('downstream').getCurrentValue('m3/h'));
-          const power = Math.round(m.measurements.type("power").variant("predicted").position('atequipment').getCurrentValue('kW'));
+          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());
           let symbolState;
           switch(state){
             case "off":
@@ -148,9 +145,6 @@ class nodeClass {
             case "decelerating":
               symbolState = "⏪";
               break;
-            case "maintenance":
-              symbolState = "🔧";
-              break;
           }
           const position = m.state.getCurrentPosition();
           const roundedPosition = Math.round(position * 100) / 100;
@@ -230,8 +224,8 @@ class nodeClass {
     //this.source.tick();
 
     const raw = this.source.getOutput();
-    const processMsg = this._output.formatMsg(raw, this.source.config, 'process');
-    const influxMsg  = this._output.formatMsg(raw, this.source.config, 'influxdb');
+    const processMsg = this._output.formatMsg(raw, this.config, 'process');
+    const influxMsg  = this._output.formatMsg(raw, this.config, 'influxdb');
 
     // Send only updated outputs on ports 0 & 1
     this.node.send([processMsg, influxMsg]);

src/specificClass.js

@@ -1,5 +1,51 @@
+/**
+ * @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,gravity,logger,configUtils,configManager,state, nrmse, MeasurementContainer, predict, interpolation , childRegistrationUtils,coolprop} = require('generalFunctions');
+const {loadCurve,logger,configUtils,configManager,state, nrmse, MeasurementContainer, predict, interpolation , childRegistrationUtils} = require('generalFunctions');
+const { name } = require('../../generalFunctions/src/convert/lodash/lodash._shimkeys');
 
 class Machine {
 
@@ -16,7 +62,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; // we need to convert the curve and add units to the curve information
+    this.curve = this.model ? loadCurve(this.model) : null;
 
     //Init config and check if it is valid
     this.config = this.configUtils.initConfig(machineConfig);
@@ -34,8 +80,10 @@ 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)
@@ -45,17 +93,7 @@ class Machine {
     this.errorMetrics = new nrmse(errorMetricsConfig, this.logger);
 
     // Initialize measurements
-    this.measurements = new MeasurementContainer({
-      autoConvert: true,
-      windowSize: 50,
-      defaultUnits: {
-        pressure: 'mbar',
-        flow: this.config.general.unit,
-        power: 'kW',
-        temperature: 'C'
-      }
-    });
-
+    this.measurements = new MeasurementContainer();
     this.interpolation = new interpolation();
 
     this.flowDrift = null;
@@ -75,40 +113,9 @@ class Machine {
       this.updatePosition();
     });
 
-    //When state changes look if we need to do other updates
-    this.state.emitter.on("stateChange", (newState) => {
-      this.logger.debug(`State change detected: ${newState}`);
-      this._updateState();
-    });
-
-
-    //perform init for certain values
-    this._init();
-
     this.child = {}; // object to hold child information so we know on what to subscribe
     this.childRegistrationUtils = new childRegistrationUtils(this); // Child registration utility
 
-
-  }
-
-  _init(){
-    //assume standard temperature is 20degrees
-    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,Date.now(),this.config.general.unit);
-      this.measurements.type("flow").variant("predicted").position("atEquipment").value(0,Date.now(),this.config.general.unit);
-    }
   }
 
   /*-------------------               Register child events               -------------------*/
@@ -129,7 +136,7 @@ class Machine {
           this.logger.debug(`🔄 ${position} ${measurementType} from ${eventData.childName}: ${eventData.value} ${eventData.unit}`);
       
 
-          this.logger.debug(` Emitting... ${eventName} with data:`);
+          console.log(` Emitting... ${eventName} with data:`);
           // Store directly in parent's measurement container
           this.measurements
             .type(measurementType)
@@ -154,10 +161,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
       this.updateMeasuredFlow(value, position, context);
       break;
       
-    case 'temperature':
-      this.updateMeasuredTemperature(value, position, context);
-      break;
-      
     default:
       this.logger.warn(`No handler for measurement type: ${measurementType}`);
       // Generic handler - just update position
@@ -203,65 +206,43 @@ _callMeasurementHandler(measurementType, value, position, context) {
   // -------- Mode and Input Management -------- //
   isValidSourceForMode(source, mode) {
     const allowedSourcesSet = this.config.mode.allowedSources[mode] || [];
-    const allowed = allowedSourcesSet.has(source);
-    allowed? 
-    this.logger.debug(`source is allowed proceeding with ${source} for mode ${mode}`) : 
-    this.logger.warn(`${source} is not allowed in mode ${mode}`);
-
-    return allowed;
+    return allowedSourcesSet.has(source);
   }
 
   isValidActionForMode(action, mode) {
     const allowedActionsSet = this.config.mode.allowedActions[mode] || [];
-    const allowed = allowedActionsSet.has(action);
-    allowed ? 
-    this.logger.debug(`Action is allowed proceeding with ${action} for mode ${mode}`) : 
-    this.logger.warn(`${action} is not allowed in mode ${mode}`);
-
-    return allowed;
+    return allowedActionsSet.has(action);
   }
 
   async handleInput(source, action, parameter) {
 
-    //sanitize input
-    if( typeof action !== 'string'){this.logger.error(`Action must be string`); return;}
-    //convert to lower case to avoid to many mistakes in commands
-    action = action.toLowerCase();
-
-    // check for validity of the request
-    if(!this.isValidActionForMode(action,this.currentMode)){return ;}
-    if (!this.isValidSourceForMode(source, this.currentMode)) {return ;}
+    if (!this.isValidSourceForMode(source, this.currentMode)) {
+      let warningTxt = `Source '${source}' is not valid for mode '${this.currentMode}'.`;
+      this.logger.warn(warningTxt);
+      return {status : false , feedback: warningTxt};
+    }
     
     this.logger.info(`Handling input from source '${source}' with action '${action}' in mode '${this.currentMode}'.`);
     
     try {
       switch (action) {
-
-        case "execsequence":
+        case "execSequence":
           return await this.executeSequence(parameter);
 
-        case "execmovement":
+        case "execMovement":
           return await this.setpoint(parameter);
 
-        case "entermaintenance":
-           
-          return await this.executeSequence(parameter);
-
-        
-        case "exitmaintenance":
-          return await this.executeSequence(parameter);
-
-        case "flowmovement":
+        case "flowMovement":
           // Calculate the control value for a desired flow
           const pos = this.calcCtrl(parameter);
           // Move to the desired setpoint
           return await this.setpoint(pos);
 
-        case "emergencystop":
+        case "emergencyStop":
           this.logger.warn(`Emergency stop activated by '${source}'.`);
           return await this.executeSequence("emergencyStop");
 
-        case "statuscheck":
+        case "statusCheck":
           this.logger.info(`Status Check: Mode = '${this.currentMode}', Source = '${source}'.`);
           break;
 
@@ -348,23 +329,21 @@ _callMeasurementHandler(measurementType, value, position, context) {
   calcFlow(x) {
     if(this.hasCurve) {
       if (!this._isOperationalState()) {
-        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.measurements.type("flow").variant("predicted").position("downstream").value(0);
         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,Date.now(),this.config.general.unit);
-      this.measurements.type("flow").variant("predicted").position("atEquipment").value(cFlow,Date.now(),this.config.general.unit);
+      this.measurements.type("flow").variant("predicted").position("downstream").value(cFlow);
       //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, Date.now(),this.config.general.unit);
-    this.measurements.type("flow").variant("predicted").position("atEquipment").value(0, Date.now(),this.config.general.unit);
+    this.measurements.type("flow").variant("predicted").position("downstream").value(0);
     return 0;
     
   }
@@ -429,11 +408,6 @@ _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
@@ -482,9 +456,6 @@ _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;
   }
 
@@ -542,12 +513,13 @@ _callMeasurementHandler(measurementType, value, position, context) {
     }
   }
 
-  // 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)
@@ -571,7 +543,6 @@ _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);
     }
   }
@@ -579,7 +550,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
   // Helper method for operational state check
   _isOperationalState() {
     const state = this.state.getCurrentState();
-    this.logger.debug(`Checking operational state ${this.state.getCurrentState()} ? ${["operational", "accelerating", "decelerating"].includes(state)}`);
     return ["operational", "accelerating", "decelerating"].includes(state);
   }
 
@@ -603,7 +573,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
       this.calcDistanceBEP(efficiency,cog,minEfficiency);
 
     }
-
   }
 
   calcDistanceFromPeak(currentEfficiency,peakEfficiency){
@@ -634,6 +603,7 @@ _callMeasurementHandler(measurementType, value, position, context) {
     };
   }
 
+
    // Calculate the center of gravity for current pressure
   calcCog() {
 
@@ -643,7 +613,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;
@@ -693,38 +663,15 @@ _callMeasurementHandler(measurementType, value, position, context) {
     return { cPower, cFlow };
   }
 
-  calcEfficiency(power,flow,variant) {
-
-    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');  
-    
-    console.log(`--------------------calc efficiency : Pressure diff:${pressureDiff},${temp}, ${g} `);
-    const rho = coolprop.PropsSI('D', 'T', temp, 'P', atmPressure, 'WasteWater');
-    
-
-    this.logger.debug(`temp: ${temp} atmPressure : ${atmPressure} rho : ${rho} pressureDiff: ${pressureDiff?.value || 0}`);
-    const flowM3s = this.measurements.type('flow').variant('predicted').position('atEquipment').getCurrentValue('m3/s');
-    const powerWatt = this.measurements.type('power').variant('predicted').position('atEquipment').getCurrentValue('W');
-    this.logger.debug(`Flow : ${flowM3s} power: ${powerWatt}`);
+  calcEfficiency(power, flow, variant) {
 
     if (power != 0 && flow != 0) {
-      const specificFlow = flow / power;
-      const specificEnergyConsumption = power / flow;
-
-      this.measurements.type("efficiency").variant(variant).position('atEquipment').value(specificFlow);
-      this.measurements.type("specificEnergyConsumption").variant(variant).position('atEquipment').value(specificEnergyConsumption);
-    
-      if(pressureDiff?.value != null && flowM3s != null && powerWatt != null){
-        const meterPerBar = pressureDiff.value / rho * g;
-        const nHydraulicEfficiency = rho * g * flowM3s * (pressureDiff.value * meterPerBar ) / powerWatt;
-        this.measurements.type("nHydraulicEfficiency").variant(variant).position('atEquipment').value(nHydraulicEfficiency);
-      }
-    
+      // Calculate efficiency after measurements update
+      this.measurements.type("efficiency").variant(variant).position('atEquipment').value((flow / power));
+    } else {
+      this.measurements.type("efficiency").variant(variant).position('atEquipment').value(null);
     }
 
-    //change this to nhydrefficiency ? 
     return this.measurements.type("efficiency").variant(variant).position('atEquipment').getCurrentValue();
 
   }
@@ -771,8 +718,26 @@ _callMeasurementHandler(measurementType, value, position, context) {
   getOutput() {
 
     // Improved output object generation
+    const output = {};
+    //build the output object
+    this.measurements.getTypes().forEach(type => {
+      this.measurements.getVariants(type).forEach(variant => {
 
-    const output = this.measurements.getFlattenedOutput();
+        const downstreamVal = this.measurements.type(type).variant(variant).position("downstream").getCurrentValue();
+        const upstreamVal = this.measurements.type(type).variant(variant).position("upstream").getCurrentValue();
+
+        if (downstreamVal != null) {
+          output[`downstream_${variant}_${type}`] = downstreamVal;
+        }
+        if (upstreamVal != null) {
+          output[`upstream_${variant}_${type}`] = upstreamVal;
+        }
+        if (downstreamVal != null && upstreamVal != null) {
+          const diffVal = this.measurements.type(type).variant(variant).difference().value;
+          output[`differential_${variant}_${type}`] = diffVal;
+        }
+      });
+    });
 
     //fill in the rest of the output object
     output["state"] = this.state.getCurrentState();
@@ -783,7 +748,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
     output["cog"] = this.cog; // flow / power efficiency
     output["NCog"] = this.NCog; // normalized cog
     output["NCogPercent"] = Math.round(this.NCog * 100 * 100) / 100 ;
-    output["maintenanceTime"] = this.state.getMaintenanceTimeHours();
 
     if(this.flowDrift != null){
       const flowDrift = this.flowDrift;
@@ -809,7 +773,7 @@ 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');
@@ -825,7 +789,6 @@ const PT1 = new Child(config={
   },
   functionality:{
     softwareType:"measurement",
-    positionVsParent:"upstream",
   },
   asset:{
     supplier:"Vega",
@@ -847,7 +810,6 @@ const PT2 = new Child(config={
   },
   functionality:{
     softwareType:"measurement",
-    positionVsParent:"upstream",
   },
   asset:{
     supplier:"Vega",
@@ -863,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.
   }
 }
 
@@ -903,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);
 
@@ -924,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(){