Merge branch 'main' of https://gitea.centraal.wbd-rd.nl/woutverheijen/EVOLV

test
2025-11-06 09:05:13 +01:00 · 2025-11-06 08:56:15 +01:00 · 2025-11-06 08:40:23 +01:00 · 2025-11-06 07:04:02 +00:00 · 2025-10-31 12:14:58 +01:00 · 2025-10-31 12:11:50 +01:00
10 changed files with 19 additions and 1334 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@

 [submodule "nodes/machineGroupControl"]
 	path = nodes/machineGroupControl
-	url = https://gitea.centraal.wbd-rd.nl/RnD/machineGroupControl.git
+	url = https://gitea.centraal.wbd-rd.nl/woutverheijen/machineGroupControl.git
 [submodule "nodes/generalFunctions"]
 	path = nodes/generalFunctions
 	url = https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git
@@ -13,13 +13,13 @@
 	url = https://gitea.centraal.wbd-rd.nl/RnD/valve.git
 [submodule "nodes/rotatingMachine"]
 	path = nodes/rotatingMachine
-	url = https://gitea.centraal.wbd-rd.nl/RnD/rotatingMachine.git
+	url = https://gitea.centraal.wbd-rd.nl/woutverheijen/rotatingMachine.git
 [submodule "nodes/monster"]
 	path = nodes/monster
 	url = https://gitea.centraal.wbd-rd.nl/RnD/monster.git
 [submodule "nodes/measurement"]
 	path = nodes/measurement
-	url = https://gitea.centraal.wbd-rd.nl/RnD/measurement.git
+	url = https://gitea.centraal.wbd-rd.nl/woutverheijen/measurement.git
 [submodule "nodes/diffuser"]
 	path = nodes/diffuser
 	url = https://gitea.centraal.wbd-rd.nl/RnD/diffuser.git
@@ -32,3 +32,6 @@
 [submodule "nodes/pumpingStation"]
 	path = nodes/pumpingStation
 	url = https://gitea.centraal.wbd-rd.nl/RnD/pumpingStation
+[submodule "nodes/settler"]
+	path = nodes/settler
+	url = https://gitea.centraal.wbd-rd.nl/RnD/settler.git
--- a/nodes/generalFunctions
+++ b/nodes/generalFunctions
--- a/nodes/machineGroupControl
+++ b/nodes/machineGroupControl
--- a/nodes/measurement
+++ b/nodes/measurement
--- a/nodes/monster
+++ b/nodes/monster
--- a/nodes/reactor
+++ b/nodes/reactor
--- a/nodes/rotatingMachine
+++ b/nodes/rotatingMachine
--- a/nodes/settler
+++ b/nodes/settler
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -15,20 +15,18 @@
      "machineGroupControl": "nodes/machineGroupControl/mgc.js",
      "measurement": "nodes/measurement/measurement.js",
      "monster": "nodes/monster/monster.js",
+      "pumpingstation": "nodes/pumpingStation/pumpingStation.js",
      "reactor": "nodes/reactor/reactor.js",
      "rotatingMachine": "nodes/rotatingMachine/rotatingMachine.js",
+      "settler": "nodes/settler/settler.js",
      "valve": "nodes/valve/valve.js",
-      "valveGroupControl": "nodes/valveGroupControl/vgc.js",
-      "pumpingstation": "nodes/pumpingStation/pumpingStation.js"
-
+      "valveGroupControl": "nodes/valveGroupControl/vgc.js"
    }
  },
  "author": "Rene De Ren, Pim Moerman, Janneke Tack, Sjoerd Fijnje, Dieke Gabriels, pieter van der wilt",
  "license": "SEE LICENSE",
  "dependencies": {
-    "@tensorflow/tfjs": "^4.22.0",
-    "@tensorflow/tfjs-node": "^4.22.0",
-    "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git",
+    "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions",
    "mathjs": "^13.2.0"
  }
 }
Author	SHA1	Message	Date
Woutverheijen	9f04b7e433	Merge branch 'main' of https://gitea.centraal.wbd-rd.nl/woutverheijen/EVOLV	2025-11-06 09:05:13 +01:00
Woutverheijen	0d13e1da40	test	2025-11-06 08:56:15 +01:00
Woutverheijen	1fcf6f8920	test	2025-11-06 08:40:23 +01:00
woutverheijen	e51062b290	merge upstream	2025-11-06 07:04:02 +00:00
p.vanderwilt	24c443840b	Add settler to package.json	2025-10-31 12:14:58 +01:00
p.vanderwilt	c4c8629c01	add settler submodule	2025-10-31 12:11:50 +01:00
renederen	609c72cedc	Merge pull request 'dev-Rene' (#5 ) from dev-Rene into main Reviewed-on: #5	2025-10-24 19:25:04 +00:00
Woutverheijen	05800cbef3	test	2025-10-24 09:38:35 +02:00
Woutverheijen	0c4419f952	Remove stale submodule nodes/heatExchanger	2025-10-16 10:48:14 +02:00