diff --git a/api-customer/Dockerfile b/api-customer/Dockerfile index 8b41b57c..19a98862 100644 --- a/api-customer/Dockerfile +++ b/api-customer/Dockerfile @@ -7,7 +7,6 @@ COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt COPY . . -ENV PYTHONUNBUFFERED=1 ENV FLASK_APP=app.py ENV FLASK_RUN_HOST=0.0.0.0 ENV FLASK_RUN_PORT=5000 diff --git a/api-customer/app.py b/api-customer/app.py index ba5880e7..c129fa55 100644 --- a/api-customer/app.py +++ b/api-customer/app.py @@ -37,6 +37,6 @@ if __name__ == '__main__': ) forwarder = MQTTForwarder(client_id, local_broker, api_broker) - forwarder.start(f"/customer/{client_id}/#", f"/board-mate/{client_id}/telemetry") + forwarder.start(f"/customer/telemetry/#", f"/board-mate/{client_id}/telemetry") app.run(host="0.0.0.0", port=5000, debug=False) diff --git a/api/mosquitto/data/mosquitto.db b/api/mosquitto/data/mosquitto.db index 717cfb4d..e8d1bea5 100644 Binary files a/api/mosquitto/data/mosquitto.db and b/api/mosquitto/data/mosquitto.db differ diff --git a/api/mosquitto/log/mosquitto.log b/api/mosquitto/log/mosquitto.log index e5d822d9..5c2f37e5 100644 --- a/api/mosquitto/log/mosquitto.log +++ b/api/mosquitto/log/mosquitto.log @@ -229,3 +229,253 @@ To fix this, use `chmod 0700 /mosquitto/config/passwords`. 1767027327: Opening ipv4 listen socket on port 8883. 1767027327: Opening ipv6 listen socket on port 8883. 1767027327: mosquitto version 2.0.22 running +1767036110: mosquitto version 2.0.22 starting +1767036110: Config loaded from /mosquitto/config/mosquitto.conf. +1767036110: Warning: File /mosquitto/config/passwords has world readable permissions. Future versions will refuse to load this file. +To fix this, use `chmod 0700 /mosquitto/config/passwords`. +1767036110: Opening ipv4 listen socket on port 1883. +1767036110: Opening ipv6 listen socket on port 1883. +1767036110: Opening websockets listen socket on port 9001. +1767036110: Opening ipv4 listen socket on port 8883. +1767036110: Opening ipv6 listen socket on port 8883. +1767036110: mosquitto version 2.0.22 running +1767036275: mosquitto version 2.0.22 terminating +1767036275: Saving in-memory database to /mosquitto/data//mosquitto.db. +1767036278: mosquitto version 2.0.22 starting +1767036278: Config loaded from /mosquitto/config/mosquitto.conf. +1767036278: Warning: File /mosquitto/config/passwords has world readable permissions. Future versions will refuse to load this file. +To fix this, use `chmod 0700 /mosquitto/config/passwords`. +1767036278: Opening ipv4 listen socket on port 1883. +1767036278: Opening ipv6 listen socket on port 1883. +1767036278: Opening websockets listen socket on port 9001. +1767036278: Opening ipv4 listen socket on port 8883. +1767036278: Opening ipv6 listen socket on port 8883. +1767036278: mosquitto version 2.0.22 running +1767036551: mosquitto version 2.0.22 terminating +1767036551: Saving in-memory database to /mosquitto/data//mosquitto.db. +1767036554: mosquitto version 2.0.22 starting +1767036554: Config loaded from /mosquitto/config/mosquitto.conf. +1767036554: Warning: File /mosquitto/config/passwords has world readable permissions. Future versions will refuse to load this file. +To fix this, use `chmod 0700 /mosquitto/config/passwords`. +1767036554: Opening ipv4 listen socket on port 1883. +1767036554: Opening ipv6 listen socket on port 1883. +1767036554: Opening websockets listen socket on port 9001. +1767036554: Opening ipv4 listen socket on port 8883. +1767036554: Opening ipv6 listen socket on port 8883. +1767036554: mosquitto version 2.0.22 running +1767036561: New connection from 172.18.0.7:44814 on port 1883. +1767036561: Sending CONNACK to board-mate-api-sub (0, 5) +1767036561: Client board-mate-api-sub disconnected, not authorised. +1767036561: New connection from 172.18.0.7:44828 on port 1883. +1767036560: Sending CONNACK to board-mate-api-sub (0, 5) +1767036560: Client board-mate-api-sub disconnected, not authorised. +1767038232: Saving in-memory database to /mosquitto/data//mosquitto.db. +1767039632: mosquitto version 2.0.22 terminating +1767039632: Saving in-memory database to /mosquitto/data//mosquitto.db. +1767042079: mosquitto version 2.0.22 starting +1767042079: Config loaded from /mosquitto/config/mosquitto.conf. +1767042079: Warning: File /mosquitto/config/passwords has world readable permissions. Future versions will refuse to load this file. +To fix this, use `chmod 0700 /mosquitto/config/passwords`. +1767042079: Opening ipv4 listen socket on port 1883. +1767042079: Opening ipv6 listen socket on port 1883. +1767042079: Opening websockets listen socket on port 9001. +1767042079: Opening ipv4 listen socket on port 8883. +1767042079: Opening ipv6 listen socket on port 8883. +1767042079: mosquitto version 2.0.22 running +1767042089: New connection from 172.18.0.7:58622 on port 1883. +1767042089: Sending CONNACK to board-mate-api (0, 5) +1767042089: Client board-mate-api disconnected, not authorised. +1767042089: New connection from 172.18.0.7:58634 on port 1883. +1767042090: Sending CONNACK to board-mate-api (0, 5) +1767042090: Client board-mate-api disconnected, not authorised. +1767042239: mosquitto version 2.0.22 terminating +1767042239: Saving in-memory database to /mosquitto/data//mosquitto.db. +1767042244: mosquitto version 2.0.22 starting +1767042244: Config loaded from /mosquitto/config/mosquitto.conf. +1767042244: Error: Unable to open pwfile "/mosquitto/config/passwords". +1767042244: Error opening password file "/mosquitto/config/passwords". +1767042270: mosquitto version 2.0.22 starting +1767042270: Config loaded from /mosquitto/config/mosquitto.conf. +1767042270: Opening ipv4 listen socket on port 1883. +1767042270: Opening ipv6 listen socket on port 1883. +1767042270: Opening websockets listen socket on port 9001. +1767042270: Opening ipv4 listen socket on port 8883. +1767042270: Opening ipv6 listen socket on port 8883. +1767042270: mosquitto version 2.0.22 running +1767042277: New connection from 172.18.0.7:54678 on port 1883. +1767042277: New client connected from 172.18.0.7:54678 as board-mate-api (p2, c0, k60, u'board-mate-api'). +1767042277: No will message specified. +1767042277: Sending CONNACK to board-mate-api (0, 0) +1767042278: Received SUBSCRIBE from board-mate-api +1767042278: /board-mate/+/telemetry (QoS 1) +1767042278: board-mate-api 1 /board-mate/+/telemetry +1767042278: Sending SUBACK to board-mate-api +1767042322: New connection from 127.0.0.1:46054 on port 1883. +1767042322: New client connected from 127.0.0.1:46054 as auto-436886A7-5624-EF3A-39ED-D7A8FC33392D (p2, c1, k60, u'board-mate-api'). +1767042322: No will message specified. +1767042322: Sending CONNACK to auto-436886A7-5624-EF3A-39ED-D7A8FC33392D (0, 0) +1767042322: Received PUBLISH from auto-436886A7-5624-EF3A-39ED-D7A8FC33392D (d0, q0, r0, m0, '/customer/1/test', ... (24 bytes)) +1767042322: Received DISCONNECT from auto-436886A7-5624-EF3A-39ED-D7A8FC33392D +1767042322: Client auto-436886A7-5624-EF3A-39ED-D7A8FC33392D disconnected. +1767042338: Received PINGREQ from board-mate-api +1767042338: Sending PINGRESP to board-mate-api +1767042345: New connection from 127.0.0.1:48154 on port 1883. +1767042345: New client connected from 127.0.0.1:48154 as auto-C830CEF1-D1ED-93D7-B749-22F0F326CC35 (p2, c1, k60, u'board-mate-api'). +1767042345: No will message specified. +1767042345: Sending CONNACK to auto-C830CEF1-D1ED-93D7-B749-22F0F326CC35 (0, 0) +1767042345: Received PUBLISH from auto-C830CEF1-D1ED-93D7-B749-22F0F326CC35 (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042345: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042345: Received DISCONNECT from auto-C830CEF1-D1ED-93D7-B749-22F0F326CC35 +1767042345: Client auto-C830CEF1-D1ED-93D7-B749-22F0F326CC35 disconnected. +1767042365: New connection from 127.0.0.1:33732 on port 1883. +1767042365: New client connected from 127.0.0.1:33732 as auto-9169093A-EC7F-3B36-E7FF-80A8320AE777 (p2, c1, k60, u'board-mate-api'). +1767042365: No will message specified. +1767042365: Sending CONNACK to auto-9169093A-EC7F-3B36-E7FF-80A8320AE777 (0, 0) +1767042365: Received PUBLISH from auto-9169093A-EC7F-3B36-E7FF-80A8320AE777 (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042365: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042365: Received DISCONNECT from auto-9169093A-EC7F-3B36-E7FF-80A8320AE777 +1767042365: Client auto-9169093A-EC7F-3B36-E7FF-80A8320AE777 disconnected. +1767042398: Received PINGREQ from board-mate-api +1767042398: Sending PINGRESP to board-mate-api +1767042417: New connection from 127.0.0.1:54506 on port 1883. +1767042417: New client connected from 127.0.0.1:54506 as auto-11DDBF2E-B63F-F8EF-C429-BF6E6730606B (p2, c1, k60, u'board-mate-api'). +1767042417: No will message specified. +1767042417: Sending CONNACK to auto-11DDBF2E-B63F-F8EF-C429-BF6E6730606B (0, 0) +1767042417: Received PUBLISH from auto-11DDBF2E-B63F-F8EF-C429-BF6E6730606B (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (25 bytes)) +1767042417: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (25 bytes)) +1767042417: Received DISCONNECT from auto-11DDBF2E-B63F-F8EF-C429-BF6E6730606B +1767042417: Client auto-11DDBF2E-B63F-F8EF-C429-BF6E6730606B disconnected. +1767042419: New connection from 127.0.0.1:54514 on port 1883. +1767042419: New client connected from 127.0.0.1:54514 as auto-BCF66CFE-1853-E2BE-825B-8F93346CD5DB (p2, c1, k60, u'board-mate-api'). +1767042419: No will message specified. +1767042419: Sending CONNACK to auto-BCF66CFE-1853-E2BE-825B-8F93346CD5DB (0, 0) +1767042419: Received PUBLISH from auto-BCF66CFE-1853-E2BE-825B-8F93346CD5DB (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (25 bytes)) +1767042419: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (25 bytes)) +1767042419: Received DISCONNECT from auto-BCF66CFE-1853-E2BE-825B-8F93346CD5DB +1767042419: Client auto-BCF66CFE-1853-E2BE-825B-8F93346CD5DB disconnected. +1767042419: New connection from 127.0.0.1:54516 on port 1883. +1767042419: New client connected from 127.0.0.1:54516 as auto-06CF9109-9AE2-4179-EF35-09B78AEC38FF (p2, c1, k60, u'board-mate-api'). +1767042419: No will message specified. +1767042419: Sending CONNACK to auto-06CF9109-9AE2-4179-EF35-09B78AEC38FF (0, 0) +1767042419: Received PUBLISH from auto-06CF9109-9AE2-4179-EF35-09B78AEC38FF (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (25 bytes)) +1767042419: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (25 bytes)) +1767042419: Received DISCONNECT from auto-06CF9109-9AE2-4179-EF35-09B78AEC38FF +1767042419: Client auto-06CF9109-9AE2-4179-EF35-09B78AEC38FF disconnected. +1767042458: Received PINGREQ from board-mate-api +1767042458: Sending PINGRESP to board-mate-api +1767042518: Received PINGREQ from board-mate-api +1767042518: Sending PINGRESP to board-mate-api +1767042578: Received PINGREQ from board-mate-api +1767042578: Sending PINGRESP to board-mate-api +1767042628: New connection from 127.0.0.1:40976 on port 1883. +1767042628: New client connected from 127.0.0.1:40976 as auto-EC3B3E59-3791-D099-C1F8-55B4217B94B0 (p2, c1, k60, u'board-mate-api'). +1767042628: No will message specified. +1767042628: Sending CONNACK to auto-EC3B3E59-3791-D099-C1F8-55B4217B94B0 (0, 0) +1767042628: Received PUBLISH from auto-EC3B3E59-3791-D099-C1F8-55B4217B94B0 (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (25 bytes)) +1767042628: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (25 bytes)) +1767042628: Received DISCONNECT from auto-EC3B3E59-3791-D099-C1F8-55B4217B94B0 +1767042628: Client auto-EC3B3E59-3791-D099-C1F8-55B4217B94B0 disconnected. +1767042649: Received PINGREQ from board-mate-api +1767042649: Sending PINGRESP to board-mate-api +1767042709: Received PINGREQ from board-mate-api +1767042709: Sending PINGRESP to board-mate-api +1767042769: Received PINGREQ from board-mate-api +1767042769: Sending PINGRESP to board-mate-api +1767042820: mosquitto version 2.0.22 terminating +1767042820: Saving in-memory database to /mosquitto/data//mosquitto.db. +1767042823: mosquitto version 2.0.22 starting +1767042823: Config loaded from /mosquitto/config/mosquitto.conf. +1767042823: Opening ipv4 listen socket on port 1883. +1767042823: Opening ipv6 listen socket on port 1883. +1767042823: Opening websockets listen socket on port 9001. +1767042823: Opening ipv4 listen socket on port 8883. +1767042823: Opening ipv6 listen socket on port 8883. +1767042823: mosquitto version 2.0.22 running +1767042833: New connection from 172.18.0.7:60284 on port 1883. +1767042833: New client connected from 172.18.0.7:60284 as board-mate-api (p2, c0, k60, u'board-mate-api'). +1767042833: No will message specified. +1767042833: Sending CONNACK to board-mate-api (1, 0) +1767042833: Received SUBSCRIBE from board-mate-api +1767042833: /board-mate/+/telemetry (QoS 1) +1767042833: board-mate-api 1 /board-mate/+/telemetry +1767042833: Sending SUBACK to board-mate-api +1767042884: New connection from 127.0.0.1:59748 on port 1883. +1767042884: New client connected from 127.0.0.1:59748 as auto-1DDE39AC-5FEC-EDA3-5D05-3247E2909DC2 (p2, c1, k60, u'board-mate-api'). +1767042884: No will message specified. +1767042884: Sending CONNACK to auto-1DDE39AC-5FEC-EDA3-5D05-3247E2909DC2 (0, 0) +1767042884: Received PUBLISH from auto-1DDE39AC-5FEC-EDA3-5D05-3247E2909DC2 (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042884: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042884: Received DISCONNECT from auto-1DDE39AC-5FEC-EDA3-5D05-3247E2909DC2 +1767042884: Client auto-1DDE39AC-5FEC-EDA3-5D05-3247E2909DC2 disconnected. +1767042893: Received PINGREQ from board-mate-api +1767042893: Sending PINGRESP to board-mate-api +1767042953: Received PINGREQ from board-mate-api +1767042953: Sending PINGRESP to board-mate-api +1767042962: mosquitto version 2.0.22 terminating +1767042962: Saving in-memory database to /mosquitto/data//mosquitto.db. +1767042965: mosquitto version 2.0.22 starting +1767042965: Config loaded from /mosquitto/config/mosquitto.conf. +1767042965: Opening ipv4 listen socket on port 1883. +1767042965: Opening ipv6 listen socket on port 1883. +1767042965: Opening websockets listen socket on port 9001. +1767042965: Opening ipv4 listen socket on port 8883. +1767042965: Opening ipv6 listen socket on port 8883. +1767042965: mosquitto version 2.0.22 running +1767042972: New connection from 172.18.0.7:36806 on port 1883. +1767042972: New client connected from 172.18.0.7:36806 as board-mate-api (p2, c0, k60, u'board-mate-api'). +1767042972: No will message specified. +1767042972: Sending CONNACK to board-mate-api (1, 0) +1767042972: Received SUBSCRIBE from board-mate-api +1767042972: /board-mate/+/telemetry (QoS 1) +1767042972: board-mate-api 1 /board-mate/+/telemetry +1767042972: Sending SUBACK to board-mate-api +1767042981: New connection from 127.0.0.1:43828 on port 1883. +1767042981: New client connected from 127.0.0.1:43828 as auto-A0661344-E010-50C3-AF17-0D6B6F5B37C7 (p2, c1, k60, u'board-mate-api'). +1767042981: No will message specified. +1767042981: Sending CONNACK to auto-A0661344-E010-50C3-AF17-0D6B6F5B37C7 (0, 0) +1767042981: Received PUBLISH from auto-A0661344-E010-50C3-AF17-0D6B6F5B37C7 (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042981: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042981: Received DISCONNECT from auto-A0661344-E010-50C3-AF17-0D6B6F5B37C7 +1767042981: Client auto-A0661344-E010-50C3-AF17-0D6B6F5B37C7 disconnected. +1767042997: New connection from 127.0.0.1:59774 on port 1883. +1767042997: New client connected from 127.0.0.1:59774 as auto-734941BC-9C59-1C8E-BE20-6332D26B82FF (p2, c1, k60, u'board-mate-api'). +1767042997: No will message specified. +1767042997: Sending CONNACK to auto-734941BC-9C59-1C8E-BE20-6332D26B82FF (0, 0) +1767042997: Received PUBLISH from auto-734941BC-9C59-1C8E-BE20-6332D26B82FF (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042997: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767042997: Received DISCONNECT from auto-734941BC-9C59-1C8E-BE20-6332D26B82FF +1767042997: Client auto-734941BC-9C59-1C8E-BE20-6332D26B82FF disconnected. +1767043032: Received PINGREQ from board-mate-api +1767043032: Sending PINGRESP to board-mate-api +1767043050: mosquitto version 2.0.22 terminating +1767043050: Saving in-memory database to /mosquitto/data//mosquitto.db. +1767043056: mosquitto version 2.0.22 starting +1767043056: Config loaded from /mosquitto/config/mosquitto.conf. +1767043056: Opening ipv4 listen socket on port 1883. +1767043056: Opening ipv6 listen socket on port 1883. +1767043056: Opening websockets listen socket on port 9001. +1767043056: Opening ipv4 listen socket on port 8883. +1767043056: Opening ipv6 listen socket on port 8883. +1767043056: mosquitto version 2.0.22 running +1767043062: New connection from 172.18.0.7:42200 on port 1883. +1767043062: New client connected from 172.18.0.7:42200 as board-mate-api (p2, c0, k60, u'board-mate-api'). +1767043062: No will message specified. +1767043062: Sending CONNACK to board-mate-api (1, 0) +1767043062: Received SUBSCRIBE from board-mate-api +1767043062: /board-mate/+/telemetry (QoS 1) +1767043062: board-mate-api 1 /board-mate/+/telemetry +1767043062: Sending SUBACK to board-mate-api +1767043087: New connection from 127.0.0.1:38796 on port 1883. +1767043087: New client connected from 127.0.0.1:38796 as auto-98A5E52B-DE57-BADF-F03D-81AEECD29E34 (p2, c1, k60, u'board-mate-api'). +1767043087: No will message specified. +1767043087: Sending CONNACK to auto-98A5E52B-DE57-BADF-F03D-81AEECD29E34 (0, 0) +1767043087: Received PUBLISH from auto-98A5E52B-DE57-BADF-F03D-81AEECD29E34 (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767043087: Sending PUBLISH to board-mate-api (d0, q0, r0, m0, '/board-mate/1/telemetry', ... (24 bytes)) +1767043087: Received DISCONNECT from auto-98A5E52B-DE57-BADF-F03D-81AEECD29E34 +1767043087: Client auto-98A5E52B-DE57-BADF-F03D-81AEECD29E34 disconnected. +1767043122: Received PINGREQ from board-mate-api +1767043122: Sending PINGRESP to board-mate-api +1767043182: Received PINGREQ from board-mate-api +1767043182: Sending PINGRESP to board-mate-api +1767043244: Received PINGREQ from board-mate-api +1767043244: Sending PINGRESP to board-mate-api diff --git a/rpi/.dockerignore b/rpi/.dockerignore new file mode 100644 index 00000000..a33338a5 --- /dev/null +++ b/rpi/.dockerignore @@ -0,0 +1,2 @@ +/training +/api-resources \ No newline at end of file diff --git a/rpi/Dockerfile b/rpi/Dockerfile new file mode 100644 index 00000000..66122d63 --- /dev/null +++ b/rpi/Dockerfile @@ -0,0 +1,18 @@ +FROM python:3.12-slim + +WORKDIR /app + +COPY requirements-base.txt . +RUN pip install --no-cache-dir -r requirements-base.txt + +COPY requirements.txt . +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + +ENV FLASK_APP=app.py +ENV FLASK_RUN_HOST=0.0.0.0 +ENV FLASK_RUN_PORT=5000 + +EXPOSE 5000 +CMD ["python", "main.py"] \ No newline at end of file diff --git a/rpi/base-requirements.txt b/rpi/base-requirements.txt new file mode 100644 index 00000000..fe08839a --- /dev/null +++ b/rpi/base-requirements.txt @@ -0,0 +1,3 @@ +numpy +opencv-python +ultralytics \ No newline at end of file diff --git a/rpi/compose.yml b/rpi/compose.yml new file mode 100644 index 00000000..229b1bb2 --- /dev/null +++ b/rpi/compose.yml @@ -0,0 +1,31 @@ +version: "3.8" + +services: + system-api: + build: . + container_name: "system-api" + ports: + - "5000:5000" + depends_on: + - mosquitto + environment: + - LOCAL_BROKER_USERNAME=system + - LOCAL_BROKER_PASSWORD=hepl + - LOCAL_BROKER_ADDRESS=system-broker + - LOCAL_BROKER_PORT=1883 + - API_BROKER_ADDRESS=192.168.15.125 + - API_BROKER_PORT=1883 + + mosquitto: + image: eclipse-mosquitto:latest + container_name: "system-broker" + ports: + - "1883:1883" + - "8883:8883" + command: ["sh", "/mosquitto/config/init-mosquitto.sh"] + volumes: + - ./mosquitto/config:/mosquitto/config + - ./mosquitto/data:/mosquitto/data + - ./mosquitto/log:/mosquitto/log + - ./mosquitto/certs:/mosquitto/certs + diff --git a/rpi/controllers/mqtt_forwarder.py b/rpi/controllers/mqtt_forwarder.py new file mode 100644 index 00000000..79516266 --- /dev/null +++ b/rpi/controllers/mqtt_forwarder.py @@ -0,0 +1,21 @@ +from services.mqtt_service import MQTTService + +class MQTTForwarder: + + client_id : str + local_broker : MQTTService + central_broker : MQTTService + + def __init__(self, client_id : str, local_mqtt: MQTTService, central_mqtt: MQTTService): + self.client_id = client_id + self.local_broker = local_mqtt + self.central_broker = central_mqtt + + def start(self, src_topic: str, dst_topic: str): + try: + def forward_handler(topic: str, msg: str): + self.central_broker.publish(dst_topic, msg) + + self.local_broker.subscribe(src_topic, forward_handler) + except Exception as e: + print(f"An error occurred while forwarding from {src_topic} to {dst_topic}: {e}") \ No newline at end of file diff --git a/rpi/main.py b/rpi/main.py index 12c10ab2..bbc14868 100644 --- a/rpi/main.py +++ b/rpi/main.py @@ -1,6 +1,9 @@ #!/usr/bin/env python3 +import os + from flask import Flask +from controllers.mqtt_forwarder import MQTTForwarder from hardware.light.lora_light_sensor_reader import LoraLightSensorReader from hardware.screen.screen import Screen from hardware.rfid.reader import RfidReader @@ -9,10 +12,35 @@ from services.mqtt_service import MQTTService app = Flask(__name__) + +client_id = "pi-1" + +local_broker_address = os.environ.get("LOCAL_BROKER_ADDRESS", "127.0.0.1") +local_broker_port = int(os.environ.get("LOCAL_BROKER_PORT", 1883)) + +api_broker_address = os.environ.get("API_BROKER_ADDRESS", "127.0.0.1") +api_broker_port = int(os.environ.get("API_BROKER_PORT", 1883)) + screen = Screen() -mqtt_service = MQTTService("127.0.0.1", 1883) rfid_reader = RfidReader("/dev/serial0", 9600) light_sensor_reader = LoraLightSensorReader("/dev/ttyUSB1", 9600) + +local_broker = MQTTService( + local_broker_address, + local_broker_port, + client_id="system", + username="system", + password="hepl", +) + +api_broker = MQTTService( + api_broker_address, + api_broker_port, + client_id=client_id, + username="pi-1", + password="hepl", +) + detection_service = DetectionService() @app.route("/party/start", methods=['POST']) @@ -20,40 +48,45 @@ def start_party(): print("Party started!") pass -def exit_app(): - rfid_reader.stop() - light_sensor_reader.stop() - exit() +def start_brokers(): + forwarder = MQTTForwarder(client_id, local_broker, api_broker) + forwarder.start(f"/system/sensor/#", f"/customer/telemetry/{client_id}") + +def start_serial_devices(): + screen.enableBackground() + screen.displayMessage("Waiting for scan...") + + rfid_reader.subscribe(lambda uid: local_broker.publish( + "/system/sensor/rfid", str(uid), 0 + )) + rfid_reader.start() + + light_sensor_reader.subscribe(lambda light_value: local_broker.publish( + "/system/sensor/light", str(light_value), 0 + )) + light_sensor_reader.start() if __name__ == "__main__": try : print("Starting app...") - screen.enableBackground() - screen.displayMessage("Waiting for scan...") + start_brokers() + print("Brokers started") - print("Screen enabled.") - - rfid_reader.subscribe(lambda uid: mqtt_service.publish( - "rpi", "/board-mate/rfid/scan", str(uid), 1 - )) - rfid_reader.start() - - print("RFID reader started.") - - light_sensor_reader.subscribe(lambda light_value: mqtt_service.publish( - "rpi", "/board-mate/light/notify", str(light_value), 0 - )) - light_sensor_reader.start() - print("Light sensor reader started.") + #start_serial_devices() + print("Serial devices started") app.run(host="0.0.0.0", port=5000, debug=False) except KeyboardInterrupt: print("Keyboard interrupt. Stopping app...") - exit_app() + local_broker.disconnect() + api_broker.disconnect() + exit() except Exception as e: print(e) - exit_app() + local_broker.disconnect() + api_broker.disconnect() + exit() diff --git a/rpi/mosquitto/config/init-mosquitto.sh b/rpi/mosquitto/config/init-mosquitto.sh new file mode 100644 index 00000000..852defbc --- /dev/null +++ b/rpi/mosquitto/config/init-mosquitto.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +PASSWORD_FILE=/mosquitto/config/passwords + +echo "Creating password file with pre-registered users..." +if [ ! -f "$PASSWORD_FILE" ]; then + touch "$PASSWORD_FILE" + chmod 600 "$PASSWORD_FILE" + + mosquitto_passwd -b "$PASSWORD_FILE" system hepl + mosquitto_passwd -b "$PASSWORD_FILE" device hepl + echo "Password file created !" +else + echo "Password file exists, skipping this step" +fi + +echo "Starting mosquitto..." +exec mosquitto -c /mosquitto/config/mosquitto.conf -v +echo "Starting started..." diff --git a/rpi/mosquitto/config/mosquitto.conf b/rpi/mosquitto/config/mosquitto.conf new file mode 100644 index 00000000..f4b81a63 --- /dev/null +++ b/rpi/mosquitto/config/mosquitto.conf @@ -0,0 +1,16 @@ +persistence true +persistence_location /mosquitto/data/ + +log_dest file /mosquitto/log/mosquitto.log + +listener 1883 0.0.0.0 + +allow_anonymous false +password_file /mosquitto/config/passwords + +listener 8883 0.0.0.0 +protocol mqtt + +certfile /mosquitto/certs/mosquitto.crt +keyfile /mosquitto/certs/mosquitto.key +tls_version tlsv1.2 diff --git a/rpi/requirements.txt b/rpi/requirements.txt index 6acf765b..fdfeb8c5 100644 --- a/rpi/requirements.txt +++ b/rpi/requirements.txt @@ -1,19 +1,8 @@ -#=========OpenApi========= -python_dateutil -setuptools -urllib3 -pydantic -typing-extensions - -#=========Custom========= +flask requests python-dotenv +pydantic +paho-mqtt pyyaml pyserial -opencv-python -numpy -ultralytics -torch -flask -paho-mqtt grovepi \ No newline at end of file diff --git a/rpi/services/mqtt_service.py b/rpi/services/mqtt_service.py index ffcb2530..9f74f194 100644 --- a/rpi/services/mqtt_service.py +++ b/rpi/services/mqtt_service.py @@ -1,32 +1,96 @@ +from typing import Callable, Optional + import paho.mqtt.client as mqtt import json import time import base64 + class MQTTService: - def __init__(self, address: str, port: int): + client : mqtt.Client + + def __init__(self, + address: str, port: int, client_id: Optional[str] = None, + username: Optional[str] = None, password: Optional[str] = None, + ca_certs: Optional[str] = None, insecure : bool = False + ): self.address = address self.port = port + self.client = mqtt.Client(client_id=client_id) - def publish(self, client_id: str, topic: str, data: str, qos: int = 0): - client = mqtt.Client(client_id=client_id) + if username and password: + self.client.username_pw_set(username, password) + + if ca_certs: + self.client.tls_set(ca_certs=ca_certs) + self.client.tls_set() + self.client.tls_insecure_set(insecure) + + self._connected = False + self.client.on_connect = self._on_connect + self.client.on_disconnect = self._on_disconnect + self.client.on_message = None + self._subscriptions = {} + + def _on_connect(self, client, userdata, flags, rc): + if rc == 0: + self._connected = True + for topic in self._subscriptions: + self.client.subscribe(topic) + else: + print(f"MQTT connection failed with code {rc}") + + def _on_disconnect(self, client, userdata, rc): + self._connected = False + + def connect(self): + if not self._connected: + print(f"Connecting to {self.address}...") + self.client.connect(self.address, self.port) + self.client.loop_start() + timeout = 5 + start = time.time() + while not self._connected and time.time() - start < timeout: + time.sleep(0.1) + if not self._connected: + raise ConnectionError(f"Cannot connect to MQTT broker at {self.address}:{self.port}") + print(f"Successfully connected to {self.address}") + else : + print(f"Already connected to {self.address}...") + + def disconnect(self): + if self._connected: + self.client.disconnect() + self.client.loop_stop() + self._connected = False + + def publish(self, topic: str, data: str, qos: int = 0): try: - client.connect(self.address, self.port) - client.loop_start() - + self.connect() payload = { "timestamp": int(time.time()), "data": data } - result = client.publish(topic, json.dumps(payload), qos=qos) + result = self.client.publish(topic, json.dumps(payload), qos=qos) result.wait_for_publish() - except Exception as e: - print("Erreur MQTT:", e) - finally: - client.loop_stop() - client.disconnect() + print(f"An error occurred while publishing on {topic} on {self.address} : {e}") + + def subscribe(self, topic: str, handler: Callable[[str, str], None], qos: int = 0): + try: + self.connect() + self._subscriptions[topic] = handler + + def on_message(client, userdata, msg): + for sub_topic, h in self._subscriptions.items(): + if mqtt.topic_matches_sub(sub_topic, msg.topic): + h(msg.topic, msg.payload.decode()) + + self.client.on_message = on_message + self.client.subscribe(topic, qos=qos) + except Exception as e: + print(f"An error occurred while trying to subscribe to {topic} on {self.address} : {e}") if __name__ == "__main__": diff --git a/rpi/training/__init__.py b/rpi/training/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/rpi/training/models/corner.pt b/rpi/training/models/corner.pt deleted file mode 100644 index 0e2d02e4..00000000 Binary files a/rpi/training/models/corner.pt and /dev/null differ diff --git a/rpi/training/models/unified-nano.pt b/rpi/training/models/unified-nano.pt deleted file mode 100644 index 05dda92c..00000000 Binary files a/rpi/training/models/unified-nano.pt and /dev/null differ diff --git a/rpi/training/models/yolo11n-pose.pt b/rpi/training/models/yolo11n-pose.pt deleted file mode 100644 index f8e73705..00000000 Binary files a/rpi/training/models/yolo11n-pose.pt and /dev/null differ diff --git a/rpi/training/models/yolo11n-seg.pt b/rpi/training/models/yolo11n-seg.pt deleted file mode 100644 index 628f5177..00000000 Binary files a/rpi/training/models/yolo11n-seg.pt and /dev/null differ diff --git a/rpi/training/models/yolo11n.pt b/rpi/training/models/yolo11n.pt deleted file mode 100644 index 45b273b4..00000000 Binary files a/rpi/training/models/yolo11n.pt and /dev/null differ diff --git a/rpi/training/models/yolo11s.pt b/rpi/training/models/yolo11s.pt deleted file mode 100644 index d4bcb83c..00000000 Binary files a/rpi/training/models/yolo11s.pt and /dev/null differ diff --git a/rpi/training/models/yolov8n.pt b/rpi/training/models/yolov8n.pt deleted file mode 100644 index 0db4ca4b..00000000 Binary files a/rpi/training/models/yolov8n.pt and /dev/null differ diff --git a/rpi/training/result/corners-training/BoxF1_curve.png b/rpi/training/result/corners-training/BoxF1_curve.png deleted file mode 100644 index fb80e7fd..00000000 Binary files a/rpi/training/result/corners-training/BoxF1_curve.png and /dev/null differ diff --git a/rpi/training/result/corners-training/BoxPR_curve.png b/rpi/training/result/corners-training/BoxPR_curve.png deleted file mode 100644 index 9a7c2d69..00000000 Binary files a/rpi/training/result/corners-training/BoxPR_curve.png and /dev/null differ diff --git a/rpi/training/result/corners-training/BoxP_curve.png b/rpi/training/result/corners-training/BoxP_curve.png deleted file mode 100644 index 3c995641..00000000 Binary files a/rpi/training/result/corners-training/BoxP_curve.png and /dev/null differ diff --git a/rpi/training/result/corners-training/BoxR_curve.png b/rpi/training/result/corners-training/BoxR_curve.png deleted file mode 100644 index 37fe3c53..00000000 Binary files a/rpi/training/result/corners-training/BoxR_curve.png and /dev/null differ diff --git a/rpi/training/result/corners-training/PoseF1_curve.png b/rpi/training/result/corners-training/PoseF1_curve.png deleted file mode 100644 index cd077107..00000000 Binary files a/rpi/training/result/corners-training/PoseF1_curve.png and /dev/null differ diff --git a/rpi/training/result/corners-training/PosePR_curve.png b/rpi/training/result/corners-training/PosePR_curve.png deleted file mode 100644 index eca87542..00000000 Binary files a/rpi/training/result/corners-training/PosePR_curve.png and /dev/null differ diff --git a/rpi/training/result/corners-training/PoseP_curve.png b/rpi/training/result/corners-training/PoseP_curve.png deleted file mode 100644 index ddc67066..00000000 Binary files a/rpi/training/result/corners-training/PoseP_curve.png and /dev/null differ diff --git a/rpi/training/result/corners-training/PoseR_curve.png b/rpi/training/result/corners-training/PoseR_curve.png deleted file mode 100644 index ac513c85..00000000 Binary files a/rpi/training/result/corners-training/PoseR_curve.png and /dev/null differ diff --git a/rpi/training/result/corners-training/args.yaml b/rpi/training/result/corners-training/args.yaml deleted file mode 100644 index cac6e821..00000000 --- a/rpi/training/result/corners-training/args.yaml +++ /dev/null @@ -1,106 +0,0 @@ -task: pose -mode: train -model: models/yolo11n-pose.pt -data: ./datasets/corners/data.yaml -epochs: 150 -time: null -patience: 20 -batch: 12 -imgsz: 640 -save: true -save_period: 25 -cache: false -device: '0' -workers: 8 -project: result -name: corners-training -exist_ok: true -pretrained: true -optimizer: auto -verbose: true -seed: 0 -deterministic: true -single_cls: false -rect: false -cos_lr: false -close_mosaic: 10 -resume: false -amp: true -fraction: 1.0 -profile: false -freeze: null -multi_scale: false -compile: false -overlap_mask: true -mask_ratio: 4 -dropout: 0.0 -val: true -split: val -save_json: false -conf: null -iou: 0.7 -max_det: 300 -half: false -dnn: false -plots: true -source: null -vid_stride: 1 -stream_buffer: false -visualize: false -augment: false -agnostic_nms: false -classes: null -retina_masks: false -embed: null -show: false -save_frames: false -save_txt: false -save_conf: false -save_crop: false -show_labels: true -show_conf: true -show_boxes: true -line_width: null -format: torchscript -keras: false -optimize: false -int8: false -dynamic: false -simplify: true -opset: null -workspace: null -nms: false -lr0: 0.01 -lrf: 0.01 -momentum: 0.937 -weight_decay: 0.0005 -warmup_epochs: 3.0 -warmup_momentum: 0.8 -warmup_bias_lr: 0.1 -box: 7.5 -cls: 0.5 -dfl: 1.5 -pose: 12.0 -kobj: 1.0 -nbs: 64 -hsv_h: 0.015 -hsv_s: 0.7 -hsv_v: 0.4 -degrees: 0.0 -translate: 0.1 -scale: 0.5 -shear: 0.0 -perspective: 0.0 -flipud: 0.0 -fliplr: 0.5 -bgr: 0.0 -mosaic: 1.0 -mixup: 0.0 -cutmix: 0.0 -copy_paste: 0.0 -copy_paste_mode: flip -auto_augment: randaugment -erasing: 0.4 -cfg: null -tracker: botsort.yaml -save_dir: C:\Users\Laurent\Desktop\board-mate\rpi\training\result\corners-training diff --git a/rpi/training/result/corners-training/confusion_matrix.png b/rpi/training/result/corners-training/confusion_matrix.png deleted file mode 100644 index 8dd173f2..00000000 Binary files a/rpi/training/result/corners-training/confusion_matrix.png and /dev/null differ diff --git a/rpi/training/result/corners-training/confusion_matrix_normalized.png b/rpi/training/result/corners-training/confusion_matrix_normalized.png deleted file mode 100644 index f1e68346..00000000 Binary files a/rpi/training/result/corners-training/confusion_matrix_normalized.png and /dev/null differ diff --git a/rpi/training/result/corners-training/labels.jpg b/rpi/training/result/corners-training/labels.jpg deleted file mode 100644 index 4b198b47..00000000 Binary files a/rpi/training/result/corners-training/labels.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/results.csv b/rpi/training/result/corners-training/results.csv deleted file mode 100644 index 1827b01d..00000000 --- a/rpi/training/result/corners-training/results.csv +++ /dev/null @@ -1,123 +0,0 @@ -epoch,time,train/box_loss,train/pose_loss,train/kobj_loss,train/cls_loss,train/dfl_loss,metrics/precision(B),metrics/recall(B),metrics/mAP50(B),metrics/mAP50-95(B),metrics/precision(P),metrics/recall(P),metrics/mAP50(P),metrics/mAP50-95(P),val/box_loss,val/pose_loss,val/kobj_loss,val/cls_loss,val/dfl_loss,lr/pg0,lr/pg1,lr/pg2 -1,41.8658,0.69307,3.77413,0.72815,0.64039,1.28117,0.96175,0.95725,0.98898,0.79175,0.79281,0.72839,0.65072,0.42698,0.75712,2.98661,0.75215,0.57127,1.28227,0.000664706,0.000664706,0.000664706 -2,80.8441,0.51914,2.12866,0.61949,0.38303,1.1348,0.96292,0.98731,0.98494,0.78,0.71747,0.72081,0.62925,0.51147,0.74913,2.41618,0.49852,0.4718,1.31998,0.00132259,0.00132259,0.00132259 -3,118.851,0.49814,1.85884,0.54851,0.37348,1.11293,0.95161,0.94825,0.95944,0.70246,0.771,0.68363,0.67966,0.45502,0.90578,2.80879,0.51889,0.8674,1.37102,0.00197167,0.00197167,0.00197167 -4,157.404,0.47059,1.66767,0.5049,0.34591,1.09446,0.99483,1,0.995,0.89386,0.8726,0.86924,0.86226,0.61132,0.49584,1.71543,0.24321,0.28147,0.97073,0.0019604,0.0019604,0.0019604 -5,200.334,0.44772,1.5232,0.48165,0.33325,1.07828,0.98863,0.99746,0.99457,0.87423,0.90156,0.88335,0.89545,0.67039,0.52482,1.67239,0.12556,0.27693,0.95892,0.0019472,0.0019472,0.0019472 -6,242.53,0.42402,1.32438,0.45056,0.31881,1.06058,0.99746,0.99728,0.995,0.9226,0.83111,0.80711,0.74127,0.48832,0.45583,1.88245,0.13891,0.31602,0.95715,0.001934,0.001934,0.001934 -7,280.951,0.40111,1.24069,0.43256,0.30494,1.04187,0.99992,0.99746,0.995,0.89269,0.90086,0.90355,0.9029,0.61367,0.50832,2.04948,0.13409,0.25962,0.94944,0.0019208,0.0019208,0.0019208 -8,318.789,0.3796,1.11959,0.39854,0.28586,1.03313,0.99367,0.99746,0.995,0.9392,0.86676,0.82487,0.84936,0.61981,0.42305,2.15732,0.13981,0.28876,0.9135,0.0019076,0.0019076,0.0019076 -9,356.462,0.37124,1.05743,0.38984,0.27503,1.02622,0.99982,1,0.995,0.95836,0.98959,0.73604,0.86569,0.80695,0.40299,1.45832,0.07292,0.24985,0.87883,0.0018944,0.0018944,0.0018944 -10,393.255,0.35552,1.01663,0.37543,0.27191,1.00972,0.99946,1,0.995,0.93964,0.85774,0.85787,0.86324,0.77142,0.41781,1.55795,0.05914,0.31105,0.91333,0.0018812,0.0018812,0.0018812 -11,430.457,0.35149,0.96948,0.37342,0.26409,1.01139,0.99981,1,0.995,0.93536,0.87028,0.87056,0.89826,0.72914,0.42494,1.68496,0.11233,0.23818,0.82714,0.001868,0.001868,0.001868 -12,467.26,0.33424,0.96809,0.35249,0.25545,1.00431,0.99947,1,0.995,0.97069,0.90561,0.90609,0.91291,0.49866,0.29453,2.32507,0.1175,0.22286,0.71953,0.0018548,0.0018548,0.0018548 -13,504.36,0.3344,0.94598,0.3399,0.25304,1.00019,0.99632,0.99746,0.995,0.95053,0.90954,0.76562,0.85441,0.71192,0.46083,1.92584,0.13254,0.26008,0.89397,0.0018416,0.0018416,0.0018416 -14,543.383,0.32972,0.92725,0.33625,0.24951,1.0016,1,0.99981,0.995,0.97263,0.85659,0.85533,0.87102,0.76749,0.31991,1.56867,0.11587,0.27602,0.78464,0.0018284,0.0018284,0.0018284 -15,582.997,0.32126,0.88673,0.32864,0.24507,0.99218,0.99796,1,0.995,0.95207,0.83305,0.80711,0.87646,0.75095,0.40368,1.55667,0.06468,0.21577,0.81679,0.0018152,0.0018152,0.0018152 -16,620.991,0.31566,0.87335,0.31561,0.24426,0.99104,0.99965,1,0.995,0.957,0.86337,0.77411,0.81892,0.75989,0.39342,1.56436,0.06818,0.39843,0.84569,0.001802,0.001802,0.001802 -17,658.811,0.30597,0.85827,0.30731,0.23968,0.98902,0.99983,1,0.995,0.96816,0.86637,0.75888,0.87673,0.8227,0.34624,1.56627,0.06645,0.23781,0.7908,0.0017888,0.0017888,0.0017888 -18,696.068,0.30208,0.81425,0.29495,0.22725,0.97742,0.9991,1,0.995,0.904,0.88491,0.88579,0.88404,0.62028,0.44549,1.8752,0.09522,0.44605,0.8804,0.0017756,0.0017756,0.0017756 -19,733.392,0.29831,0.78058,0.2869,0.23091,0.97986,0.99963,1,0.995,0.9597,0.9044,0.90355,0.93166,0.70766,0.36051,1.62024,0.14267,0.22122,0.80243,0.0017624,0.0017624,0.0017624 -20,771.296,0.29695,0.76096,0.28061,0.22734,0.97716,0.99963,1,0.995,0.95951,0.89305,0.8934,0.86533,0.53941,0.28948,1.57599,0.05685,0.20087,0.7097,0.0017492,0.0017492,0.0017492 -21,826.556,0.29791,0.76895,0.27933,0.22934,0.97495,0.99978,1,0.995,0.96711,0.92375,0.92386,0.95084,0.69793,0.32625,1.27303,0.12668,0.18997,0.74181,0.001736,0.001736,0.001736 -22,890.215,0.28593,0.71649,0.26951,0.22073,0.97144,0.99736,1,0.995,0.95264,0.91376,0.91624,0.91481,0.83206,0.33567,1.14861,0.06273,0.20222,0.78067,0.0017228,0.0017228,0.0017228 -23,953.322,0.28703,0.7198,0.26899,0.21899,0.97015,0.99703,1,0.995,0.9584,0.89138,0.88579,0.89882,0.77509,0.31369,1.59085,0.17639,0.24751,0.73889,0.0017096,0.0017096,0.0017096 -24,1002.22,0.28576,0.69198,0.25922,0.22184,0.97505,0.99979,1,0.995,0.96712,0.9465,0.9467,0.95094,0.85392,0.39743,1.07425,0.05928,0.2521,0.83125,0.0016964,0.0016964,0.0016964 -25,1038.67,0.28313,0.62082,0.2471,0.21496,0.97352,0.99985,1,0.995,0.95423,0.93894,0.93909,0.95908,0.85361,0.38329,0.94256,0.04887,0.23358,0.86399,0.0016832,0.0016832,0.0016832 -26,1075.24,0.28052,0.60793,0.25178,0.21419,0.96934,0.9997,1,0.995,0.97003,0.92358,0.92386,0.94426,0.89564,0.36543,0.87032,0.05428,0.23958,0.82694,0.00167,0.00167,0.00167 -27,1111.68,0.27994,0.5941,0.24751,0.21598,0.97132,0.99965,1,0.995,0.97209,0.97427,0.97462,0.98093,0.76219,0.27744,1.08364,0.0685,0.16464,0.70475,0.0016568,0.0016568,0.0016568 -28,1148.44,0.27895,0.58447,0.23733,0.2172,0.9677,0.99984,1,0.995,0.96578,0.95938,0.95939,0.95958,0.87034,0.33851,0.85532,0.06884,0.24491,0.79852,0.0016436,0.0016436,0.0016436 -29,1185.3,0.26658,0.557,0.22924,0.20513,0.96139,0.99984,1,0.995,0.97653,0.94662,0.9467,0.96267,0.93081,0.31553,0.65388,0.04317,0.18593,0.77426,0.0016304,0.0016304,0.0016304 -30,1222.29,0.26477,0.51292,0.21651,0.20264,0.96425,1,0.99983,0.995,0.96328,0.95726,0.95431,0.96143,0.83551,0.34112,0.91659,0.10449,0.22019,0.7806,0.0016172,0.0016172,0.0016172 -31,1259.93,0.26796,0.51762,0.20983,0.20697,0.96354,0.99969,1,0.995,0.94867,0.96416,0.96447,0.97433,0.82392,0.38355,0.96983,0.06258,0.19046,0.84624,0.001604,0.001604,0.001604 -32,1296.88,0.26934,0.49529,0.20868,0.20734,0.9661,0.99979,1,0.995,0.95502,0.95167,0.95178,0.95085,0.89775,0.37629,0.74517,0.05738,0.18957,0.82154,0.0015908,0.0015908,0.0015908 -33,1333.09,0.26369,0.45548,0.19971,0.20748,0.9625,0.99474,0.99746,0.9949,0.96513,0.9593,0.96193,0.97472,0.52948,0.3929,1.97617,0.0817,0.21653,0.79713,0.0015776,0.0015776,0.0015776 -34,1369.3,0.27149,0.45399,0.19625,0.21297,0.96413,0.99992,1,0.995,0.97354,0.96438,0.96447,0.97564,0.92317,0.25638,0.73132,0.0626,0.15593,0.68058,0.0015644,0.0015644,0.0015644 -35,1405.8,0.2666,0.44038,0.18882,0.19958,0.96435,0.99981,1,0.995,0.9722,0.94652,0.9467,0.94965,0.78254,0.27424,1.14871,0.08366,0.17643,0.71587,0.0015512,0.0015512,0.0015512 -36,1444.12,0.26001,0.41753,0.18053,0.19944,0.96203,0.99979,1,0.995,0.97126,0.95515,0.95431,0.96911,0.94105,0.32598,0.53702,0.05907,0.1853,0.76014,0.001538,0.001538,0.001538 -37,1480.32,0.25838,0.41353,0.17386,0.19782,0.96008,0.99967,1,0.995,0.96558,0.96683,0.96701,0.96566,0.87858,0.27835,0.82348,0.0548,0.18958,0.71508,0.0015248,0.0015248,0.0015248 -38,1516.59,0.26064,0.38703,0.16722,0.19878,0.96442,0.99859,1,0.995,0.97447,0.95781,0.95178,0.96992,0.88664,0.25487,0.81123,0.0456,0.15648,0.68062,0.0015116,0.0015116,0.0015116 -39,1553.25,0.24811,0.40134,0.15999,0.19272,0.95348,1,0.99982,0.995,0.96885,0.89805,0.89594,0.88223,0.81577,0.33967,0.98544,0.07561,0.19696,0.74205,0.0014984,0.0014984,0.0014984 -40,1589.29,0.25209,0.39657,0.15808,0.19776,0.95718,0.99983,1,0.995,0.97593,0.9643,0.96447,0.97216,0.93621,0.23164,0.54743,0.05507,0.15628,0.66362,0.0014852,0.0014852,0.0014852 -41,1628.9,0.25354,0.3777,0.15138,0.19667,0.96049,0.99934,1,0.995,0.96965,0.9689,0.96954,0.97076,0.947,0.30746,0.47588,0.05501,0.22409,0.74888,0.001472,0.001472,0.001472 -42,1665.68,0.24466,0.35839,0.13647,0.19282,0.95365,0.99983,1,0.995,0.96907,0.95669,0.95685,0.96969,0.93875,0.32129,0.52932,0.06228,0.18452,0.74446,0.0014588,0.0014588,0.0014588 -43,1702.27,0.24527,0.3491,0.13757,0.19238,0.95308,0.99982,1,0.995,0.96759,0.94906,0.94924,0.96437,0.89086,0.34469,0.61009,0.07387,0.18267,0.77154,0.0014456,0.0014456,0.0014456 -44,1738.51,0.24462,0.3412,0.13426,0.18944,0.95347,0.9998,1,0.995,0.97091,0.97442,0.97462,0.98198,0.89922,0.28994,0.82945,0.06073,0.1874,0.71154,0.0014324,0.0014324,0.0014324 -45,1774.81,0.24343,0.34856,0.1267,0.18817,0.94882,0.99973,1,0.995,0.97358,0.94869,0.9467,0.95493,0.90639,0.33497,0.67311,0.1771,0.18214,0.76598,0.0014192,0.0014192,0.0014192 -46,1810.98,0.24607,0.3128,0.12697,0.19242,0.95653,0.99985,1,0.995,0.97492,0.95678,0.95685,0.97235,0.93275,0.32419,0.60639,0.07634,0.17342,0.76716,0.001406,0.001406,0.001406 -47,1847.36,0.2482,0.32888,0.127,0.22637,0.96001,0.99985,1,0.995,0.97087,0.93388,0.93401,0.92631,0.87381,0.27904,0.78575,0.08141,0.17671,0.71643,0.0013928,0.0013928,0.0013928 -48,1883.96,0.24328,0.31338,0.12048,0.19025,0.94999,0.99983,1,0.995,0.97431,0.97699,0.97716,0.98361,0.93479,0.26735,0.40829,0.04812,0.14566,0.68872,0.0013796,0.0013796,0.0013796 -49,1920.36,0.23871,0.32326,0.12284,0.18374,0.9494,0.99985,1,0.995,0.96977,0.96432,0.96447,0.97387,0.79972,0.27748,0.79306,0.19351,0.17076,0.70923,0.0013664,0.0013664,0.0013664 -50,1956.45,0.24304,0.31749,0.12285,0.18452,0.95087,0.99983,1,0.995,0.97325,0.96941,0.96954,0.97677,0.8745,0.29011,0.55133,0.11191,0.1434,0.69653,0.0013532,0.0013532,0.0013532 -51,1993.55,0.23827,0.29298,0.11593,0.1822,0.94408,0.99938,1,0.995,0.97526,0.96387,0.96447,0.97424,0.93482,0.31133,0.4847,0.0533,0.15991,0.72714,0.00134,0.00134,0.00134 -52,2030.55,0.23563,0.28018,0.11237,0.18133,0.94868,0.99983,1,0.995,0.97096,0.97699,0.97716,0.98402,0.96395,0.31517,0.44986,0.07793,0.20216,0.74575,0.0013268,0.0013268,0.0013268 -53,2066.75,0.23384,0.29695,0.11892,0.1789,0.94541,0.99984,1,0.995,0.97256,0.95927,0.95939,0.97009,0.79479,0.26033,1.10111,0.12698,0.1648,0.69885,0.0013136,0.0013136,0.0013136 -54,2102.91,0.23152,0.2776,0.11114,0.18141,0.94411,0.99982,1,0.995,0.97631,0.97198,0.97208,0.97655,0.95527,0.3197,0.43438,0.03767,0.3008,0.73837,0.0013004,0.0013004,0.0013004 -55,2138.82,0.23046,0.26741,0.10828,0.17577,0.94546,0.99985,1,0.995,0.98041,0.98209,0.98223,0.98877,0.96507,0.2604,0.35929,0.04404,0.16826,0.69072,0.0012872,0.0012872,0.0012872 -56,2174.67,0.22749,0.26357,0.10458,0.17443,0.94552,0.99975,1,0.995,0.97582,0.97692,0.97716,0.98358,0.94576,0.27214,0.35448,0.29325,0.15032,0.69325,0.001274,0.001274,0.001274 -57,2210.82,0.22765,0.24893,0.10514,0.17317,0.94568,0.99984,1,0.995,0.97058,0.97701,0.97716,0.98411,0.95634,0.2492,0.34523,0.04154,0.14017,0.65436,0.0012608,0.0012608,0.0012608 -58,2247.23,0.22911,0.25326,0.09969,0.17453,0.94687,0.99984,1,0.995,0.96941,0.94401,0.94416,0.93237,0.80447,0.29883,0.53882,0.09426,0.15442,0.70813,0.0012476,0.0012476,0.0012476 -59,2283.26,0.22888,0.26267,0.09782,0.17675,0.94686,0.99978,1,0.995,0.96272,0.99475,0.99492,0.99497,0.93516,0.26397,0.43593,0.04185,0.16742,0.68021,0.0012344,0.0012344,0.0012344 -60,2318.97,0.23292,0.25173,0.09804,0.17627,0.94668,0.99981,1,0.995,0.97242,0.97951,0.9797,0.98016,0.94961,0.27568,0.35899,0.0853,0.1925,0.70429,0.0012212,0.0012212,0.0012212 -61,2356.26,0.22807,0.24696,0.10027,0.17422,0.94721,0.99983,1,0.995,0.9662,0.97953,0.9797,0.97445,0.93525,0.23848,0.40063,0.07996,0.16476,0.66578,0.001208,0.001208,0.001208 -62,2392.87,0.22747,0.2581,0.10249,0.17503,0.95321,0.9996,1,0.995,0.97074,0.9793,0.9797,0.97513,0.94557,0.26975,0.39598,0.05737,0.15921,0.68649,0.0011948,0.0011948,0.0011948 -63,2428.91,0.22766,0.24132,0.09611,0.17477,0.94303,0.99971,1,0.995,0.96235,0.97941,0.9797,0.97348,0.93612,0.2428,0.35819,0.039,0.15311,0.66118,0.0011816,0.0011816,0.0011816 -64,2465.95,0.22517,0.21765,0.09105,0.17103,0.94599,0.9998,1,0.995,0.96668,0.98457,0.98477,0.9841,0.94901,0.2771,0.36874,0.06648,0.15681,0.67964,0.0011684,0.0011684,0.0011684 -65,2503.83,0.22064,0.21802,0.09219,0.1702,0.9411,0.99979,1,0.995,0.97612,0.96442,0.96447,0.96162,0.91155,0.24653,0.68639,0.14368,0.18795,0.66392,0.0011552,0.0011552,0.0011552 -66,2541.56,0.22615,0.23008,0.09458,0.17335,0.94477,0.99964,1,0.995,0.9735,0.98188,0.98223,0.98454,0.91693,0.29998,0.56021,0.03456,0.16208,0.7394,0.001142,0.001142,0.001142 -67,2579.34,0.21895,0.22134,0.09177,0.17007,0.9393,0.9998,1,0.995,0.96791,0.98965,0.98985,0.98513,0.95475,0.29002,0.41934,0.04548,0.19376,0.70637,0.0011288,0.0011288,0.0011288 -68,2615.21,0.21973,0.1919,0.08678,0.1709,0.93963,0.99978,1,0.995,0.96724,0.98202,0.98223,0.98349,0.90306,0.26922,0.61318,0.10111,0.20667,0.69965,0.0011156,0.0011156,0.0011156 -69,2650.96,0.2166,0.22402,0.0907,0.16562,0.93782,0.99982,1,0.995,0.97324,0.97191,0.97208,0.98134,0.94279,0.28298,0.46992,0.04373,0.21881,0.71916,0.0011024,0.0011024,0.0011024 -70,2686.79,0.21906,0.20668,0.08299,0.16491,0.93901,0.99965,1,0.995,0.96212,0.98442,0.98477,0.98336,0.96374,0.26579,0.35204,0.08746,0.16889,0.68702,0.0010892,0.0010892,0.0010892 -71,2724.45,0.21016,0.19774,0.08291,0.1634,0.93385,0.9997,1,0.995,0.96475,0.98198,0.98223,0.98332,0.94531,0.27078,0.51252,0.04689,0.18894,0.70118,0.001076,0.001076,0.001076 -72,2760.19,0.2149,0.20865,0.08638,0.16158,0.9367,0.99985,1,0.995,0.97249,0.98722,0.98731,0.99049,0.97898,0.28486,0.2826,0.03408,0.18064,0.71769,0.0010628,0.0010628,0.0010628 -73,2795.77,0.21372,0.18585,0.07757,0.16098,0.93502,0.99985,1,0.995,0.96926,0.98463,0.98477,0.98439,0.96686,0.23842,0.32887,0.03542,0.16675,0.67708,0.0010496,0.0010496,0.0010496 -74,2832.16,0.21219,0.19808,0.08108,0.16174,0.93811,0.99981,1,0.995,0.97396,0.98204,0.98223,0.98686,0.96267,0.25053,0.38738,0.04021,0.16226,0.66394,0.0010364,0.0010364,0.0010364 -75,2884.25,0.21154,0.17501,0.07794,0.16458,0.93535,0.99984,1,0.995,0.96454,0.98212,0.98223,0.98262,0.94393,0.26803,0.44257,0.0566,0.1929,0.70009,0.0010232,0.0010232,0.0010232 -76,2944.97,0.21228,0.19711,0.08138,0.16737,0.93377,0.99983,1,0.995,0.96646,0.98715,0.98731,0.98447,0.92461,0.24225,0.41607,0.0348,0.16097,0.67341,0.00101,0.00101,0.00101 -77,3008.25,0.2151,0.1833,0.07709,0.16469,0.9407,0.99973,1,0.995,0.96418,0.98196,0.98223,0.98366,0.93001,0.2628,0.46921,0.09878,0.17788,0.70491,0.0009968,0.0009968,0.0009968 -78,3049.31,0.21425,0.18755,0.07687,0.1605,0.93539,0.99822,1,0.995,0.96739,0.98056,0.98223,0.98358,0.90628,0.26047,0.53634,0.05729,0.17455,0.68519,0.0009836,0.0009836,0.0009836 -79,3087.06,0.20793,0.1773,0.0746,0.16126,0.9352,0.99975,1,0.995,0.96655,0.98199,0.98223,0.98287,0.91938,0.29016,0.47211,0.05869,0.18346,0.7069,0.0009704,0.0009704,0.0009704 -80,3124.02,0.20848,0.17801,0.0768,0.16115,0.93479,0.99979,1,0.995,0.96672,0.9715,0.96701,0.97093,0.96037,0.28392,0.54634,0.09783,0.17891,0.71633,0.0009572,0.0009572,0.0009572 -81,3160.53,0.2073,0.16688,0.07229,0.15915,0.93552,0.99956,1,0.995,0.96926,0.97164,0.97208,0.97233,0.91555,0.26665,0.54827,0.0452,0.18538,0.69744,0.000944,0.000944,0.000944 -82,3197.02,0.2093,0.16428,0.06873,0.15987,0.93266,0.99981,1,0.995,0.97185,0.98458,0.98477,0.98373,0.95155,0.24957,0.33346,0.0599,0.14366,0.66852,0.0009308,0.0009308,0.0009308 -83,3233.19,0.20772,0.15941,0.07021,0.16025,0.93347,0.99975,1,0.995,0.96732,0.96675,0.96701,0.96219,0.9355,0.27792,0.42357,0.03927,0.16484,0.70684,0.0009176,0.0009176,0.0009176 -84,3269.31,0.20127,0.16847,0.06499,0.15542,0.93088,0.99971,1,0.995,0.96479,0.97434,0.97462,0.9718,0.951,0.25128,0.35881,0.03472,0.16965,0.67475,0.0009044,0.0009044,0.0009044 -85,3305.8,0.20216,0.15587,0.06895,0.15625,0.9334,0.99963,1,0.995,0.96885,0.97172,0.97208,0.97419,0.95291,0.26132,0.37446,0.03852,0.15243,0.69368,0.0008912,0.0008912,0.0008912 -86,3344.2,0.20354,0.16737,0.07149,0.15566,0.9329,0.99929,1,0.995,0.96572,0.97644,0.97716,0.9739,0.94227,0.2245,0.34752,0.03232,0.1351,0.65493,0.000878,0.000878,0.000878 -87,3389.15,0.20533,0.1604,0.06719,0.15668,0.9326,0.99941,1,0.995,0.9638,0.97929,0.9797,0.97424,0.93558,0.22373,0.34606,0.03417,0.13217,0.64715,0.0008648,0.0008648,0.0008648 -88,3438.25,0.20257,0.15615,0.06746,0.15741,0.93127,0.99979,1,0.995,0.96633,0.98203,0.98223,0.98305,0.93607,0.25572,0.38356,0.03464,0.17148,0.69273,0.0008516,0.0008516,0.0008516 -89,3499.91,0.20039,0.13643,0.06695,0.15308,0.93165,0.99985,1,0.995,0.96586,0.97447,0.97462,0.97358,0.85146,0.23551,0.44653,0.03699,0.13512,0.66228,0.0008384,0.0008384,0.0008384 -90,3561.09,0.20274,0.15695,0.06701,0.15267,0.93225,0.99983,1,0.995,0.96748,0.97446,0.97462,0.97583,0.89462,0.2269,0.41481,0.03757,0.16208,0.67632,0.0008252,0.0008252,0.0008252 -91,3618.14,0.19302,0.14341,0.06578,0.14975,0.92917,0.99985,1,0.995,0.97232,0.97448,0.97462,0.9762,0.97089,0.23752,0.2991,0.03227,0.16581,0.72065,0.000812,0.000812,0.000812 -92,3654.23,0.20038,0.15799,0.0652,0.15218,0.9318,0.99984,1,0.995,0.97259,0.98207,0.98223,0.98726,0.98131,0.21235,0.2616,0.04773,0.12781,0.64291,0.0007988,0.0007988,0.0007988 -93,3689.65,0.19023,0.13662,0.06122,0.14574,0.92551,0.99981,1,0.995,0.97527,0.97951,0.9797,0.98493,0.97308,0.2032,0.29249,0.03368,0.14232,0.63621,0.0007856,0.0007856,0.0007856 -94,3724.7,0.19616,0.13415,0.05921,0.14865,0.93075,0.99984,1,0.995,0.97642,0.98208,0.98223,0.987,0.97595,0.21629,0.30119,0.03241,0.14311,0.64116,0.0007724,0.0007724,0.0007724 -95,3759.63,0.20054,0.13043,0.06445,0.15849,0.93305,0.99982,1,0.995,0.97745,0.97699,0.97716,0.98311,0.94879,0.23807,0.39694,0.03499,0.17089,0.65597,0.0007592,0.0007592,0.0007592 -96,3797.99,0.20053,0.14308,0.06001,0.15525,0.92858,0.99964,1,0.995,0.9757,0.97681,0.97716,0.98337,0.94553,0.20586,0.39662,0.03853,0.11513,0.63758,0.000746,0.000746,0.000746 -97,3834.19,0.19415,0.13198,0.06327,0.15219,0.9291,0.99978,1,0.995,0.97892,0.98202,0.98223,0.98701,0.92947,0.21512,0.38049,0.03895,0.12492,0.64288,0.0007328,0.0007328,0.0007328 -98,3869.36,0.19769,0.13726,0.05792,0.1582,0.93047,0.99983,1,0.995,0.97584,0.97954,0.9797,0.98502,0.96447,0.29181,0.43827,0.04533,0.25325,0.69339,0.0007196,0.0007196,0.0007196 -99,3905.48,0.1931,0.14005,0.05879,0.14691,0.92704,0.9998,1,0.995,0.97531,0.9795,0.9797,0.98592,0.97457,0.25615,0.35473,0.05087,0.19319,0.67247,0.0007064,0.0007064,0.0007064 -100,3941.48,0.19669,0.13246,0.05929,0.15339,0.92856,0.99981,1,0.995,0.96973,0.97951,0.9797,0.97536,0.9677,0.29806,0.33783,0.0409,0.17006,0.71805,0.0006932,0.0006932,0.0006932 -101,3977.45,0.19787,0.12413,0.05634,0.14962,0.92788,0.99972,1,0.995,0.97416,0.9845,0.98477,0.98513,0.97464,0.27688,0.29723,0.03804,0.1582,0.69637,0.00068,0.00068,0.00068 -102,4013.43,0.19365,0.12164,0.05403,0.14708,0.92507,0.99973,1,0.995,0.97829,0.98704,0.98731,0.98973,0.98363,0.22145,0.23119,0.03078,0.11484,0.63888,0.0006668,0.0006668,0.0006668 -103,4049.86,0.18922,0.12249,0.0541,0.14511,0.92592,0.9996,1,0.995,0.97635,0.98184,0.98223,0.98645,0.98314,0.22662,0.25381,0.03791,0.12071,0.64712,0.0006536,0.0006536,0.0006536 -104,4085.9,0.19198,0.12236,0.05401,0.14777,0.9304,0.9998,1,0.995,0.97503,0.9795,0.9797,0.98496,0.98162,0.27936,0.26264,0.05589,0.1843,0.72599,0.0006404,0.0006404,0.0006404 -105,4121.83,0.18681,0.11665,0.05452,0.14126,0.92572,0.99984,1,0.995,0.97532,0.98461,0.98477,0.98821,0.98357,0.23599,0.21897,0.03495,0.12562,0.65805,0.0006272,0.0006272,0.0006272 -106,4159.34,0.18931,0.12302,0.05285,0.14246,0.92584,0.99982,1,0.995,0.97722,0.98205,0.98223,0.98684,0.97835,0.25876,0.29638,0.03407,0.16049,0.6784,0.000614,0.000614,0.000614 -107,4195.74,0.18796,0.11484,0.05041,0.14362,0.9265,0.99979,1,0.995,0.96935,0.97949,0.9797,0.97924,0.95248,0.24025,0.2878,0.02369,0.13361,0.65578,0.0006008,0.0006008,0.0006008 -108,4231.54,0.18757,0.11764,0.05198,0.14475,0.92646,0.9998,1,0.995,0.96933,0.98204,0.98223,0.98245,0.93037,0.27001,0.40162,0.03723,0.17234,0.70029,0.0005876,0.0005876,0.0005876 -109,4267.56,0.19175,0.11254,0.05275,0.145,0.9276,0.99983,1,0.995,0.97396,0.98207,0.98223,0.98434,0.93374,0.25562,0.4719,0.02845,0.15375,0.68166,0.0005744,0.0005744,0.0005744 -110,4303.6,0.18424,0.11282,0.05199,0.14493,0.92974,0.99984,1,0.995,0.97399,0.98461,0.98477,0.98563,0.92607,0.24741,0.53219,0.03147,0.15061,0.67807,0.0005612,0.0005612,0.0005612 -111,4339.91,0.18773,0.10936,0.05228,0.14673,0.92905,0.99983,1,0.995,0.97165,0.9846,0.98477,0.98355,0.91287,0.24123,0.47352,0.0301,0.15751,0.67074,0.000548,0.000548,0.000548 -112,4376.47,0.18008,0.10368,0.05034,0.13864,0.92094,0.99979,1,0.995,0.97363,0.98202,0.98223,0.98648,0.95041,0.25188,0.48111,0.02839,0.14908,0.67927,0.0005348,0.0005348,0.0005348 -113,4413.13,0.18541,0.122,0.0518,0.14829,0.9254,0.99976,1,0.995,0.96913,0.982,0.98223,0.98294,0.95892,0.246,0.32916,0.02569,0.15708,0.67047,0.0005216,0.0005216,0.0005216 -114,4449.44,0.17684,0.10055,0.04513,0.13459,0.9226,0.99979,1,0.995,0.97342,0.98203,0.98223,0.98619,0.9794,0.2232,0.25121,0.02916,0.12833,0.64652,0.0005084,0.0005084,0.0005084 -115,4485.77,0.17897,0.09904,0.04583,0.13773,0.92376,0.9998,1,0.995,0.9742,0.98458,0.98477,0.98789,0.97447,0.26093,0.31745,0.03068,0.19056,0.67449,0.0004952,0.0004952,0.0004952 -116,4522.97,0.17672,0.10152,0.04676,0.13291,0.91946,0.99982,1,0.995,0.97666,0.98713,0.98731,0.98997,0.97642,0.23816,0.29252,0.0356,0.14726,0.65811,0.000482,0.000482,0.000482 -117,4559.69,0.17613,0.10321,0.04537,0.13302,0.92168,0.99984,1,0.995,0.97696,0.98715,0.98731,0.98983,0.97863,0.24862,0.28556,0.03062,0.15368,0.67233,0.0004688,0.0004688,0.0004688 -118,4596.34,0.17646,0.10323,0.04861,0.13363,0.91883,0.99985,1,0.995,0.9785,0.98716,0.98731,0.98994,0.97648,0.23669,0.2839,0.02463,0.14847,0.66231,0.0004556,0.0004556,0.0004556 -119,4632.45,0.17602,0.10081,0.04742,0.13517,0.91892,0.99976,1,0.995,0.9778,0.98708,0.98731,0.98987,0.96218,0.241,0.30527,0.02843,0.14518,0.66692,0.0004424,0.0004424,0.0004424 -120,4668.66,0.17735,0.10765,0.05064,0.13768,0.92402,0.9997,1,0.995,0.97626,0.98448,0.98477,0.98786,0.95995,0.22648,0.33094,0.02432,0.13178,0.64916,0.0004292,0.0004292,0.0004292 -121,4704.27,0.1743,0.09213,0.04368,0.13562,0.92291,0.99978,1,0.995,0.97755,0.98456,0.98477,0.98787,0.94648,0.23997,0.34039,0.02239,0.1435,0.66791,0.000416,0.000416,0.000416 -122,4757.92,0.17425,0.09085,0.04699,0.13466,0.91992,0.99965,1,0.995,0.97818,0.98443,0.98477,0.98801,0.94732,0.25639,0.34739,0.0231,0.14642,0.68408,0.0004028,0.0004028,0.0004028 diff --git a/rpi/training/result/corners-training/results.png b/rpi/training/result/corners-training/results.png deleted file mode 100644 index 0878f5de..00000000 Binary files a/rpi/training/result/corners-training/results.png and /dev/null differ diff --git a/rpi/training/result/corners-training/train_batch0.jpg b/rpi/training/result/corners-training/train_batch0.jpg deleted file mode 100644 index 15e7b5e8..00000000 Binary files a/rpi/training/result/corners-training/train_batch0.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/train_batch1.jpg b/rpi/training/result/corners-training/train_batch1.jpg deleted file mode 100644 index 0ec040e7..00000000 Binary files a/rpi/training/result/corners-training/train_batch1.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/train_batch2.jpg b/rpi/training/result/corners-training/train_batch2.jpg deleted file mode 100644 index e8132142..00000000 Binary files a/rpi/training/result/corners-training/train_batch2.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/val_batch0_labels.jpg b/rpi/training/result/corners-training/val_batch0_labels.jpg deleted file mode 100644 index 73aab30d..00000000 Binary files a/rpi/training/result/corners-training/val_batch0_labels.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/val_batch0_pred.jpg b/rpi/training/result/corners-training/val_batch0_pred.jpg deleted file mode 100644 index d99a7b60..00000000 Binary files a/rpi/training/result/corners-training/val_batch0_pred.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/val_batch1_labels.jpg b/rpi/training/result/corners-training/val_batch1_labels.jpg deleted file mode 100644 index 5215fdee..00000000 Binary files a/rpi/training/result/corners-training/val_batch1_labels.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/val_batch1_pred.jpg b/rpi/training/result/corners-training/val_batch1_pred.jpg deleted file mode 100644 index 12964dc5..00000000 Binary files a/rpi/training/result/corners-training/val_batch1_pred.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/val_batch2_labels.jpg b/rpi/training/result/corners-training/val_batch2_labels.jpg deleted file mode 100644 index a7f4e6fa..00000000 Binary files a/rpi/training/result/corners-training/val_batch2_labels.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/val_batch2_pred.jpg b/rpi/training/result/corners-training/val_batch2_pred.jpg deleted file mode 100644 index 5d84e353..00000000 Binary files a/rpi/training/result/corners-training/val_batch2_pred.jpg and /dev/null differ diff --git a/rpi/training/result/corners-training/weights/best.pt b/rpi/training/result/corners-training/weights/best.pt deleted file mode 100644 index ad4f266d..00000000 Binary files a/rpi/training/result/corners-training/weights/best.pt and /dev/null differ diff --git a/rpi/training/result/corners-training/weights/epoch0.pt b/rpi/training/result/corners-training/weights/epoch0.pt deleted file mode 100644 index 9b09c9a6..00000000 Binary files a/rpi/training/result/corners-training/weights/epoch0.pt and /dev/null differ diff --git a/rpi/training/result/corners-training/weights/epoch100.pt b/rpi/training/result/corners-training/weights/epoch100.pt deleted file mode 100644 index 045a6298..00000000 Binary files a/rpi/training/result/corners-training/weights/epoch100.pt and /dev/null differ diff --git a/rpi/training/result/corners-training/weights/epoch25.pt b/rpi/training/result/corners-training/weights/epoch25.pt deleted file mode 100644 index 6663362a..00000000 Binary files a/rpi/training/result/corners-training/weights/epoch25.pt and /dev/null differ diff --git a/rpi/training/result/corners-training/weights/epoch50.pt b/rpi/training/result/corners-training/weights/epoch50.pt deleted file mode 100644 index fac748c5..00000000 Binary files a/rpi/training/result/corners-training/weights/epoch50.pt and /dev/null differ diff --git a/rpi/training/result/corners-training/weights/epoch75.pt b/rpi/training/result/corners-training/weights/epoch75.pt deleted file mode 100644 index c415a0f0..00000000 Binary files a/rpi/training/result/corners-training/weights/epoch75.pt and /dev/null differ diff --git a/rpi/training/result/corners-training/weights/last.pt b/rpi/training/result/corners-training/weights/last.pt deleted file mode 100644 index 0d611736..00000000 Binary files a/rpi/training/result/corners-training/weights/last.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/BoxF1_curve.png b/rpi/training/result/edges-nano/BoxF1_curve.png deleted file mode 100644 index 8e83dad3..00000000 Binary files a/rpi/training/result/edges-nano/BoxF1_curve.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/BoxPR_curve.png b/rpi/training/result/edges-nano/BoxPR_curve.png deleted file mode 100644 index 7d5e8510..00000000 Binary files a/rpi/training/result/edges-nano/BoxPR_curve.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/BoxP_curve.png b/rpi/training/result/edges-nano/BoxP_curve.png deleted file mode 100644 index 046cdb05..00000000 Binary files a/rpi/training/result/edges-nano/BoxP_curve.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/BoxR_curve.png b/rpi/training/result/edges-nano/BoxR_curve.png deleted file mode 100644 index 36520098..00000000 Binary files a/rpi/training/result/edges-nano/BoxR_curve.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/MaskF1_curve.png b/rpi/training/result/edges-nano/MaskF1_curve.png deleted file mode 100644 index 10cd5b53..00000000 Binary files a/rpi/training/result/edges-nano/MaskF1_curve.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/MaskPR_curve.png b/rpi/training/result/edges-nano/MaskPR_curve.png deleted file mode 100644 index d4169991..00000000 Binary files a/rpi/training/result/edges-nano/MaskPR_curve.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/MaskP_curve.png b/rpi/training/result/edges-nano/MaskP_curve.png deleted file mode 100644 index dd560158..00000000 Binary files a/rpi/training/result/edges-nano/MaskP_curve.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/MaskR_curve.png b/rpi/training/result/edges-nano/MaskR_curve.png deleted file mode 100644 index 73a78654..00000000 Binary files a/rpi/training/result/edges-nano/MaskR_curve.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/args.yaml b/rpi/training/result/edges-nano/args.yaml deleted file mode 100644 index 12fc7ad2..00000000 --- a/rpi/training/result/edges-nano/args.yaml +++ /dev/null @@ -1,106 +0,0 @@ -task: segment -mode: train -model: models/yolo11n-seg.pt -data: ./datasets/edges/data.yaml -epochs: 150 -time: null -patience: 20 -batch: 12 -imgsz: 640 -save: true -save_period: 10 -cache: false -device: '0' -workers: 8 -project: result -name: edges-nano -exist_ok: false -pretrained: true -optimizer: auto -verbose: true -seed: 0 -deterministic: true -single_cls: false -rect: false -cos_lr: false -close_mosaic: 10 -resume: false -amp: true -fraction: 1.0 -profile: false -freeze: null -multi_scale: false -compile: false -overlap_mask: true -mask_ratio: 4 -dropout: 0.0 -val: true -split: val -save_json: false -conf: null -iou: 0.7 -max_det: 300 -half: false -dnn: false -plots: true -source: null -vid_stride: 1 -stream_buffer: false -visualize: false -augment: false -agnostic_nms: false -classes: null -retina_masks: false -embed: null -show: false -save_frames: false -save_txt: false -save_conf: false -save_crop: false -show_labels: true -show_conf: true -show_boxes: true -line_width: null -format: torchscript -keras: false -optimize: false -int8: false -dynamic: false -simplify: true -opset: null -workspace: null -nms: false -lr0: 0.01 -lrf: 0.01 -momentum: 0.937 -weight_decay: 0.0005 -warmup_epochs: 3.0 -warmup_momentum: 0.8 -warmup_bias_lr: 0.1 -box: 7.5 -cls: 0.5 -dfl: 1.5 -pose: 12.0 -kobj: 1.0 -nbs: 64 -hsv_h: 0.015 -hsv_s: 0.7 -hsv_v: 0.4 -degrees: 0.0 -translate: 0.1 -scale: 0.5 -shear: 0.0 -perspective: 0.0 -flipud: 0.0 -fliplr: 0.5 -bgr: 0.0 -mosaic: 1.0 -mixup: 0.0 -cutmix: 0.0 -copy_paste: 0.0 -copy_paste_mode: flip -auto_augment: randaugment -erasing: 0.4 -cfg: null -tracker: botsort.yaml -save_dir: C:\Users\Laurent\Desktop\board-mate\rpi\training\result\edges-nano diff --git a/rpi/training/result/edges-nano/confusion_matrix.png b/rpi/training/result/edges-nano/confusion_matrix.png deleted file mode 100644 index 5eff0efa..00000000 Binary files a/rpi/training/result/edges-nano/confusion_matrix.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/confusion_matrix_normalized.png b/rpi/training/result/edges-nano/confusion_matrix_normalized.png deleted file mode 100644 index 83afe957..00000000 Binary files a/rpi/training/result/edges-nano/confusion_matrix_normalized.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/labels.jpg b/rpi/training/result/edges-nano/labels.jpg deleted file mode 100644 index c1d7d212..00000000 Binary files a/rpi/training/result/edges-nano/labels.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/results.csv b/rpi/training/result/edges-nano/results.csv deleted file mode 100644 index f72a05b8..00000000 --- a/rpi/training/result/edges-nano/results.csv +++ /dev/null @@ -1,117 +0,0 @@ -epoch,time,train/box_loss,train/seg_loss,train/cls_loss,train/dfl_loss,metrics/precision(B),metrics/recall(B),metrics/mAP50(B),metrics/mAP50-95(B),metrics/precision(M),metrics/recall(M),metrics/mAP50(M),metrics/mAP50-95(M),val/box_loss,val/seg_loss,val/cls_loss,val/dfl_loss,lr/pg0,lr/pg1,lr/pg2 -1,107.847,0.52721,0.86298,1.14096,1.02452,0.95706,0.96913,0.98188,0.88943,0.95461,0.96783,0.97848,0.92424,0.43132,0.42199,0.72877,1.04563,0.0033287,0.0033287,0.0033287 -2,211.841,0.44686,0.4797,0.53649,0.95043,0.97437,0.95304,0.98593,0.917,0.9726,0.9513,0.97861,0.92974,0.36926,0.50062,0.43777,0.96565,0.00661807,0.00661807,0.00661807 -3,308,0.51156,0.51316,0.48149,0.97834,0.9446,0.95913,0.97742,0.88401,0.94374,0.95826,0.97528,0.91235,0.44433,0.50938,0.41321,1.03414,0.00986343,0.00986343,0.00986343 -4,405.057,0.5207,0.54139,0.444,0.98303,0.94353,0.97338,0.97167,0.8953,0.941,0.97077,0.96878,0.91011,0.38921,0.50847,0.37159,0.98678,0.009802,0.009802,0.009802 -5,503.769,0.48829,0.50109,0.39484,0.9659,0.96479,0.95739,0.9814,0.91605,0.96391,0.95652,0.98075,0.94035,0.37348,0.40976,0.34067,0.98688,0.009736,0.009736,0.009736 -6,603.199,0.44573,0.46749,0.35913,0.94838,0.95772,0.98498,0.98425,0.93875,0.95603,0.98324,0.98323,0.95328,0.30719,0.33623,0.30263,0.92314,0.00967,0.00967,0.00967 -7,701.51,0.42676,0.44513,0.34182,0.94303,0.96426,0.98531,0.99037,0.95563,0.96256,0.98375,0.98949,0.96634,0.29032,0.31303,0.25712,0.89738,0.009604,0.009604,0.009604 -8,800.417,0.40862,0.4292,0.32337,0.93522,0.9692,0.99043,0.99207,0.95962,0.96835,0.98957,0.99176,0.97232,0.27948,0.30555,0.24238,0.89432,0.009538,0.009538,0.009538 -9,899.854,0.39211,0.41682,0.30726,0.92751,0.97541,0.98522,0.99297,0.96516,0.97369,0.98348,0.99245,0.97488,0.27858,0.30034,0.23503,0.89253,0.009472,0.009472,0.009472 -10,998.52,0.37684,0.39683,0.29676,0.92015,0.96844,0.98725,0.99224,0.96648,0.96767,0.98892,0.99137,0.97177,0.2589,0.30764,0.22978,0.87593,0.009406,0.009406,0.009406 -11,1099.57,0.36701,0.3901,0.29155,0.91807,0.97418,0.98261,0.99171,0.96789,0.97245,0.98087,0.99115,0.97332,0.26057,0.28331,0.23488,0.87961,0.00934,0.00934,0.00934 -12,1198.78,0.35667,0.37464,0.28446,0.91647,0.9783,0.98001,0.99237,0.96782,0.97656,0.97827,0.99185,0.97345,0.25721,0.27423,0.21859,0.87886,0.009274,0.009274,0.009274 -13,1298.74,0.34492,0.36335,0.27292,0.91135,0.96843,0.98698,0.9909,0.9572,0.96672,0.98524,0.98923,0.96333,0.25834,0.28256,0.2392,0.88907,0.009208,0.009208,0.009208 -14,1395.12,0.34504,0.363,0.27146,0.9142,0.9668,0.98768,0.98881,0.96683,0.96595,0.98681,0.98818,0.9743,0.24674,0.27189,0.21869,0.87302,0.009142,0.009142,0.009142 -15,1490.44,0.33934,0.35701,0.26753,0.91182,0.97507,0.98629,0.99286,0.97156,0.97421,0.98542,0.99266,0.97694,0.24772,0.27236,0.20878,0.86691,0.009076,0.009076,0.009076 -16,1589.01,0.32836,0.34028,0.2593,0.90553,0.97563,0.99217,0.99296,0.97335,0.97478,0.9913,0.99273,0.98075,0.22147,0.2518,0.20329,0.84851,0.00901,0.00901,0.00901 -17,1688.77,0.32741,0.34381,0.25711,0.90524,0.97663,0.98609,0.99208,0.97429,0.97577,0.98522,0.99138,0.97726,0.21371,0.24954,0.19601,0.84607,0.008944,0.008944,0.008944 -18,1787.51,0.3245,0.33391,0.25284,0.90678,0.97665,0.98348,0.99259,0.97682,0.97578,0.98261,0.99222,0.98053,0.21078,0.24404,0.18937,0.84082,0.008878,0.008878,0.008878 -19,1886.49,0.31572,0.33354,0.24965,0.89871,0.97977,0.98261,0.9924,0.97865,0.97817,0.98087,0.99144,0.9801,0.20476,0.24179,0.19052,0.83205,0.008812,0.008812,0.008812 -20,1984.11,0.31172,0.33331,0.24687,0.90068,0.9827,0.98816,0.99354,0.98233,0.98184,0.98729,0.99312,0.98418,0.20096,0.25097,0.17218,0.82988,0.008746,0.008746,0.008746 -21,2081.73,0.31086,0.32866,0.24377,0.89988,0.98765,0.98174,0.99339,0.97762,0.98677,0.98087,0.99293,0.98155,0.21773,0.23336,0.18595,0.84376,0.00868,0.00868,0.00868 -22,2176.5,0.30628,0.32043,0.23928,0.90007,0.986,0.98022,0.99243,0.97854,0.98513,0.97935,0.99179,0.97967,0.1986,0.23492,0.18422,0.83212,0.008614,0.008614,0.008614 -23,2273.73,0.29791,0.31342,0.23157,0.89284,0.98023,0.99182,0.99259,0.98277,0.97937,0.99095,0.99239,0.98313,0.1893,0.22676,0.17066,0.8275,0.008548,0.008548,0.008548 -24,2373.58,0.29793,0.3141,0.23308,0.89246,0.98319,0.99304,0.99291,0.98368,0.98233,0.99217,0.99259,0.9827,0.18488,0.23068,0.16163,0.82214,0.008482,0.008482,0.008482 -25,2471.68,0.29756,0.31658,0.23125,0.89431,0.98024,0.99191,0.993,0.98238,0.97938,0.99107,0.99249,0.98302,0.1895,0.22699,0.17048,0.82978,0.008416,0.008416,0.008416 -26,2569.79,0.29619,0.30354,0.23038,0.89486,0.98768,0.98522,0.99336,0.98248,0.98506,0.98261,0.99276,0.98343,0.19131,0.22987,0.16194,0.82622,0.00835,0.00835,0.00835 -27,2668.19,0.29071,0.31135,0.22767,0.89316,0.97596,0.9884,0.99275,0.982,0.9751,0.98753,0.99256,0.98184,0.18551,0.2253,0.16818,0.81831,0.008284,0.008284,0.008284 -28,2767.34,0.28938,0.31037,0.22534,0.89248,0.97924,0.98418,0.99194,0.98112,0.9775,0.98244,0.99144,0.98149,0.18282,0.21719,0.17099,0.82046,0.008218,0.008218,0.008218 -29,2863.38,0.28634,0.30647,0.2266,0.89076,0.9852,0.98375,0.99333,0.98135,0.98345,0.98201,0.99205,0.98352,0.18189,0.21539,0.16538,0.81536,0.008152,0.008152,0.008152 -30,2961.53,0.28431,0.30689,0.22148,0.88882,0.9832,0.98348,0.99303,0.98327,0.98233,0.98261,0.99238,0.98341,0.1805,0.21713,0.16704,0.81625,0.008086,0.008086,0.008086 -31,3060.95,0.28019,0.30226,0.21823,0.88867,0.97834,0.9913,0.99307,0.98274,0.97748,0.99043,0.99235,0.98211,0.17961,0.22615,0.16259,0.81651,0.00802,0.00802,0.00802 -32,3159.09,0.28009,0.29671,0.21843,0.88636,0.98622,0.98696,0.99274,0.98474,0.98535,0.98609,0.99159,0.98474,0.1755,0.22404,0.15472,0.81,0.007954,0.007954,0.007954 -33,3283.17,0.27592,0.29208,0.21545,0.88575,0.98512,0.98696,0.99307,0.98394,0.98425,0.98609,0.99264,0.98547,0.17483,0.21325,0.15813,0.81005,0.007888,0.007888,0.007888 -34,3428.45,0.27591,0.29288,0.21188,0.89014,0.98611,0.98806,0.99342,0.98452,0.98525,0.98719,0.993,0.98523,0.17652,0.20526,0.15379,0.81851,0.007822,0.007822,0.007822 -35,3550.9,0.27433,0.2968,0.21354,0.88813,0.97851,0.98972,0.99297,0.98386,0.97765,0.98885,0.99262,0.98422,0.17037,0.21182,0.14861,0.80926,0.007756,0.007756,0.007756 -36,3657.09,0.27319,0.287,0.2105,0.88652,0.97939,0.99164,0.99332,0.98437,0.97853,0.99085,0.99242,0.98552,0.16931,0.21514,0.15294,0.8092,0.00769,0.00769,0.00769 -37,3782.23,0.26943,0.28317,0.21014,0.88438,0.98784,0.98876,0.99285,0.98559,0.98697,0.98789,0.99202,0.9857,0.16731,0.21337,0.15326,0.80781,0.007624,0.007624,0.007624 -38,3940.62,0.27105,0.28908,0.21144,0.88662,0.99213,0.98699,0.99338,0.98617,0.9891,0.98783,0.9926,0.98656,0.15869,0.2083,0.13522,0.8036,0.007558,0.007558,0.007558 -39,4072.86,0.26492,0.27526,0.20484,0.88591,0.98964,0.98696,0.99281,0.98695,0.98877,0.98609,0.99181,0.98614,0.16551,0.2036,0.14647,0.80637,0.007492,0.007492,0.007492 -40,4172.63,0.26602,0.28533,0.20697,0.88646,0.98528,0.98921,0.9936,0.98422,0.98441,0.98834,0.99293,0.98513,0.16638,0.20797,0.1441,0.8097,0.007426,0.007426,0.007426 -41,4279.16,0.26753,0.27984,0.20912,0.88635,0.98823,0.9887,0.9937,0.98625,0.9865,0.98696,0.99293,0.98627,0.15909,0.20736,0.14165,0.80237,0.00736,0.00736,0.00736 -42,4379.6,0.26213,0.27729,0.202,0.88377,0.98898,0.98783,0.99328,0.98681,0.98811,0.98696,0.99268,0.98722,0.16117,0.20903,0.14508,0.8047,0.007294,0.007294,0.007294 -43,4482.65,0.26356,0.27833,0.20689,0.8846,0.98664,0.99043,0.99348,0.98706,0.98491,0.9887,0.99285,0.98634,0.15905,0.21222,0.14651,0.80541,0.007228,0.007228,0.007228 -44,4587.38,0.26245,0.2721,0.20489,0.88247,0.9794,0.99242,0.99279,0.98484,0.97855,0.99155,0.99227,0.98563,0.15991,0.20451,0.1494,0.8079,0.007162,0.007162,0.007162 -45,4720.87,0.26093,0.27546,0.20192,0.88395,0.98712,0.98435,0.99327,0.9859,0.98538,0.98261,0.99286,0.98608,0.15651,0.20262,0.14215,0.80211,0.007096,0.007096,0.007096 -46,4836.26,0.25691,0.27387,0.19994,0.8795,0.97768,0.99038,0.99316,0.98708,0.97682,0.98951,0.9927,0.98675,0.14856,0.20668,0.13947,0.79501,0.00703,0.00703,0.00703 -47,4937.59,0.26141,0.27651,0.20042,0.8849,0.98872,0.99067,0.99365,0.98785,0.98785,0.9898,0.99308,0.98787,0.15137,0.20431,0.13473,0.80331,0.006964,0.006964,0.006964 -48,5076.53,0.25335,0.26878,0.19769,0.8797,0.98691,0.98957,0.99366,0.98749,0.98604,0.9887,0.99322,0.98674,0.1512,0.20275,0.13833,0.7981,0.006898,0.006898,0.006898 -49,5221.15,0.25461,0.26933,0.19551,0.8829,0.99032,0.97891,0.99312,0.9857,0.98944,0.97804,0.99217,0.98494,0.15005,0.20016,0.13982,0.79806,0.006832,0.006832,0.006832 -50,5347.85,0.25388,0.26372,0.20132,0.88001,0.98603,0.98609,0.99279,0.98544,0.98436,0.98529,0.99222,0.98599,0.16602,0.19515,0.16115,0.81139,0.006766,0.006766,0.006766 -51,5446.41,0.25017,0.26252,0.19767,0.88037,0.98386,0.98957,0.9935,0.98808,0.98299,0.9887,0.99301,0.98793,0.14872,0.19888,0.14064,0.79716,0.0067,0.0067,0.0067 -52,5546.74,0.24902,0.26676,0.19416,0.88038,0.98597,0.98696,0.99361,0.98833,0.9851,0.98609,0.99294,0.98854,0.1473,0.19526,0.13054,0.79453,0.006634,0.006634,0.006634 -53,5648.25,0.25061,0.26463,0.19772,0.87817,0.98249,0.98957,0.99353,0.98846,0.98163,0.9887,0.9931,0.98846,0.14946,0.1953,0.13429,0.79606,0.006568,0.006568,0.006568 -54,5748.43,0.24758,0.26677,0.19111,0.87727,0.98957,0.99015,0.99375,0.98856,0.9887,0.98928,0.99343,0.98851,0.14773,0.19844,0.13145,0.79443,0.006502,0.006502,0.006502 -55,5847.71,0.24924,0.26486,0.19337,0.87963,0.99035,0.98696,0.99349,0.98674,0.98948,0.98609,0.99286,0.98746,0.14658,0.19858,0.13049,0.79657,0.006436,0.006436,0.006436 -56,5948.91,0.24522,0.2614,0.18804,0.8765,0.98634,0.98783,0.99357,0.98774,0.98547,0.98696,0.99312,0.98804,0.14555,0.19767,0.12854,0.79345,0.00637,0.00637,0.00637 -57,6046.81,0.24461,0.25488,0.1877,0.87849,0.99018,0.98522,0.99339,0.98798,0.98931,0.98435,0.99276,0.98708,0.14312,0.19874,0.12753,0.79348,0.006304,0.006304,0.006304 -58,6146.2,0.24441,0.26141,0.18825,0.8783,0.98528,0.98965,0.99346,0.98791,0.98442,0.98878,0.99271,0.98708,0.14057,0.19596,0.12326,0.79345,0.006238,0.006238,0.006238 -59,6246.06,0.23959,0.2483,0.18563,0.87405,0.9876,0.9913,0.99345,0.98837,0.98673,0.99043,0.99292,0.98837,0.13775,0.19224,0.12165,0.79272,0.006172,0.006172,0.006172 -60,6346.47,0.23885,0.25093,0.18315,0.8762,0.99046,0.98783,0.99346,0.98739,0.98959,0.98696,0.99309,0.98757,0.13777,0.19455,0.12347,0.79413,0.006106,0.006106,0.006106 -61,6445.7,0.24102,0.25811,0.18485,0.87531,0.98787,0.99043,0.99375,0.98854,0.987,0.98957,0.99333,0.98913,0.13641,0.19321,0.11934,0.79002,0.00604,0.00604,0.00604 -62,6546.68,0.23896,0.25377,0.1834,0.87567,0.99111,0.9913,0.99379,0.98876,0.99024,0.99043,0.99335,0.98931,0.13539,0.19097,0.11847,0.79166,0.005974,0.005974,0.005974 -63,6646.1,0.23742,0.24918,0.18155,0.87494,0.98927,0.9913,0.99385,0.9888,0.9884,0.99043,0.99369,0.98909,0.13428,0.19132,0.11804,0.79076,0.005908,0.005908,0.005908 -64,6746.41,0.23531,0.24925,0.18051,0.87635,0.99061,0.9887,0.99377,0.98918,0.98974,0.98783,0.99358,0.98915,0.1357,0.19201,0.11777,0.79173,0.005842,0.005842,0.005842 -65,6845.24,0.23575,0.25051,0.17938,0.87435,0.99169,0.98783,0.99377,0.99001,0.99081,0.98696,0.99322,0.98949,0.13505,0.19327,0.11525,0.79065,0.005776,0.005776,0.005776 -66,6945.39,0.23063,0.24356,0.17718,0.87477,0.99355,0.98696,0.99359,0.99022,0.99268,0.98609,0.9932,0.98921,0.13243,0.19537,0.11622,0.7896,0.00571,0.00571,0.00571 -67,7045.89,0.23135,0.24419,0.17955,0.87322,0.99226,0.98522,0.99366,0.99024,0.99138,0.98435,0.9931,0.9895,0.13099,0.19336,0.11721,0.78831,0.005644,0.005644,0.005644 -68,7145.09,0.23057,0.24131,0.17753,0.87449,0.9912,0.9913,0.99393,0.98994,0.99033,0.99043,0.99333,0.98966,0.13016,0.19263,0.11315,0.78685,0.005578,0.005578,0.005578 -69,7241.54,0.23138,0.24037,0.1771,0.87235,0.99295,0.98783,0.99399,0.99037,0.99208,0.98696,0.99352,0.98936,0.12992,0.19553,0.11402,0.78607,0.005512,0.005512,0.005512 -70,7339.34,0.23042,0.24063,0.17737,0.87156,0.99043,0.99001,0.99402,0.99001,0.98956,0.98919,0.99359,0.9897,0.12757,0.195,0.11428,0.78472,0.005446,0.005446,0.005446 -71,7440.52,0.22789,0.24112,0.17268,0.87278,0.99126,0.98668,0.99386,0.98904,0.99039,0.98606,0.99343,0.98935,0.12873,0.19415,0.1132,0.78489,0.00538,0.00538,0.00538 -72,7541.18,0.23064,0.24128,0.17866,0.8756,0.99126,0.98623,0.99373,0.99002,0.99039,0.98587,0.99324,0.98932,0.12882,0.18836,0.11673,0.78488,0.005314,0.005314,0.005314 -73,7642.52,0.22769,0.24242,0.17408,0.87305,0.99304,0.98522,0.99384,0.98968,0.99129,0.98348,0.99337,0.98942,0.12898,0.18826,0.11708,0.78523,0.005248,0.005248,0.005248 -74,7744.03,0.22611,0.24119,0.17246,0.86984,0.99041,0.98782,0.99373,0.9901,0.98752,0.98609,0.99321,0.98912,0.1296,0.18957,0.12095,0.78648,0.005182,0.005182,0.005182 -75,7847.33,0.22393,0.23545,0.17213,0.87062,0.99353,0.98522,0.99384,0.99031,0.98444,0.99,0.9934,0.98962,0.12963,0.18741,0.12031,0.78659,0.005116,0.005116,0.005116 -76,7948.12,0.22531,0.23716,0.17236,0.87239,0.99137,0.98522,0.99372,0.99016,0.98951,0.98387,0.99303,0.98935,0.12738,0.18816,0.11963,0.78498,0.00505,0.00505,0.00505 -77,8048.73,0.22722,0.24195,0.17362,0.87179,0.98965,0.98522,0.99368,0.98937,0.9879,0.98348,0.99303,0.98896,0.12702,0.18462,0.11948,0.7845,0.004984,0.004984,0.004984 -78,8149.22,0.22423,0.23931,0.16946,0.87213,0.98988,0.98522,0.99386,0.98951,0.98813,0.98348,0.99328,0.98925,0.12623,0.18385,0.11818,0.78371,0.004918,0.004918,0.004918 -79,8248.95,0.22342,0.2358,0.17204,0.87211,0.99022,0.98522,0.99378,0.98962,0.98847,0.98348,0.99322,0.98908,0.12468,0.18246,0.1195,0.78236,0.004852,0.004852,0.004852 -80,8349.88,0.22232,0.22808,0.16801,0.87284,0.98959,0.9887,0.99368,0.99002,0.98785,0.98696,0.99308,0.98892,0.1247,0.18315,0.11735,0.78294,0.004786,0.004786,0.004786 -81,8449.66,0.22067,0.23243,0.16748,0.87033,0.99126,0.98631,0.99359,0.9903,0.99039,0.98544,0.99324,0.9894,0.12434,0.17951,0.11361,0.78327,0.00472,0.00472,0.00472 -82,8551.93,0.22243,0.22983,0.16944,0.87181,0.98729,0.9913,0.99381,0.99031,0.98642,0.99043,0.99352,0.98972,0.12484,0.17985,0.11328,0.78381,0.004654,0.004654,0.004654 -83,8648.59,0.22028,0.23233,0.16666,0.8705,0.98923,0.99043,0.99379,0.99063,0.98738,0.98957,0.99348,0.98982,0.12503,0.17971,0.11253,0.7841,0.004588,0.004588,0.004588 -84,8748.67,0.21639,0.22697,0.16399,0.87016,0.98957,0.98962,0.99378,0.99036,0.9887,0.98878,0.9934,0.98954,0.12442,0.18161,0.11082,0.78324,0.004522,0.004522,0.004522 -85,8850.99,0.21939,0.22881,0.16786,0.87219,0.99043,0.99043,0.99379,0.99043,0.98956,0.98957,0.99338,0.98981,0.12324,0.18243,0.11056,0.7824,0.004456,0.004456,0.004456 -86,8950.73,0.21613,0.22691,0.16661,0.8692,0.98833,0.9913,0.99371,0.99018,0.98746,0.99043,0.99327,0.98942,0.12193,0.18335,0.11169,0.78142,0.00439,0.00439,0.00439 -87,9051.13,0.21453,0.2228,0.16246,0.86885,0.98872,0.99096,0.99371,0.99013,0.98785,0.99009,0.99323,0.9893,0.12044,0.18404,0.11258,0.78011,0.004324,0.004324,0.004324 -88,9152.48,0.21682,0.22344,0.16186,0.87082,0.98926,0.98957,0.99365,0.99007,0.98752,0.98783,0.99305,0.9892,0.11985,0.18472,0.11146,0.77982,0.004258,0.004258,0.004258 -89,9255.58,0.21336,0.22346,0.16062,0.86966,0.98867,0.98957,0.99345,0.98968,0.98693,0.98783,0.99281,0.98888,0.12109,0.1848,0.11003,0.78052,0.004192,0.004192,0.004192 -90,9357.27,0.21107,0.22494,0.1601,0.86871,0.98813,0.98957,0.99364,0.99027,0.98639,0.98783,0.99296,0.98896,0.12081,0.18615,0.10934,0.77999,0.004126,0.004126,0.004126 -91,9459.27,0.21223,0.22007,0.16388,0.86684,0.98856,0.99043,0.99386,0.99049,0.98682,0.9887,0.9933,0.98997,0.1189,0.18616,0.10993,0.77835,0.00406,0.00406,0.00406 -92,9561.02,0.21092,0.2237,0.16179,0.8681,0.9897,0.9887,0.99389,0.9904,0.98712,0.9887,0.9934,0.98989,0.11821,0.18479,0.10797,0.77804,0.003994,0.003994,0.003994 -93,9660.85,0.21216,0.22736,0.16144,0.8675,0.99013,0.99043,0.99394,0.99103,0.98835,0.9887,0.99337,0.99023,0.11807,0.18461,0.10653,0.77787,0.003928,0.003928,0.003928 -94,9759.24,0.20852,0.21977,0.15714,0.86504,0.99099,0.99043,0.99397,0.99106,0.99012,0.98957,0.9935,0.99032,0.11778,0.18495,0.10632,0.7777,0.003862,0.003862,0.003862 -95,9857.62,0.20808,0.22114,0.15844,0.8692,0.99099,0.99043,0.9939,0.99046,0.98902,0.9887,0.99332,0.99022,0.11763,0.18441,0.10582,0.77763,0.003796,0.003796,0.003796 -96,9957.91,0.20941,0.22203,0.15866,0.86763,0.99129,0.98975,0.9939,0.99146,0.99042,0.98888,0.99342,0.99029,0.11712,0.18465,0.10474,0.77737,0.00373,0.00373,0.00373 -97,10056.3,0.20591,0.21762,0.15666,0.86606,0.99214,0.98843,0.99391,0.99114,0.99127,0.98756,0.99351,0.99036,0.11673,0.18515,0.1042,0.77721,0.003664,0.003664,0.003664 -98,10155.7,0.20691,0.21885,0.15554,0.86666,0.99128,0.98834,0.99386,0.99055,0.99041,0.98747,0.99348,0.99029,0.1163,0.1856,0.10369,0.77695,0.003598,0.003598,0.003598 -99,10256.9,0.20577,0.22249,0.15425,0.86595,0.99127,0.98765,0.99364,0.99068,0.9904,0.98678,0.99324,0.98948,0.11618,0.18499,0.10421,0.77715,0.003532,0.003532,0.003532 -100,10355.6,0.20311,0.22198,0.15325,0.86532,0.98871,0.98991,0.99384,0.99049,0.98784,0.98904,0.99351,0.9897,0.11577,0.18463,0.10425,0.77677,0.003466,0.003466,0.003466 -101,10454.2,0.20147,0.21825,0.15342,0.86525,0.99128,0.98889,0.99385,0.99052,0.99041,0.98802,0.99349,0.98977,0.11572,0.18382,0.10408,0.77696,0.0034,0.0034,0.0034 -102,10553.8,0.20307,0.21295,0.15367,0.86584,0.99128,0.98868,0.99387,0.99046,0.99041,0.98782,0.99352,0.99026,0.11598,0.18367,0.10393,0.77721,0.003334,0.003334,0.003334 -103,10654.4,0.19875,0.21258,0.15119,0.86495,0.99128,0.98906,0.99389,0.99087,0.99041,0.98819,0.99356,0.98972,0.11595,0.18309,0.1052,0.77713,0.003268,0.003268,0.003268 -104,10754.4,0.20044,0.21075,0.15066,0.86607,0.99088,0.9887,0.99385,0.99076,0.98869,0.98806,0.99337,0.98953,0.11607,0.18257,0.10604,0.77726,0.003202,0.003202,0.003202 -105,10853.6,0.19926,0.21057,0.15057,0.86453,0.99006,0.9887,0.99386,0.99079,0.98918,0.98783,0.99335,0.98946,0.1159,0.18214,0.1055,0.77734,0.003136,0.003136,0.003136 -106,10953.1,0.19816,0.20993,0.14868,0.86661,0.99073,0.9887,0.99382,0.99091,0.98943,0.98783,0.99335,0.98965,0.11551,0.18218,0.10496,0.7771,0.00307,0.00307,0.00307 -107,11054,0.19633,0.20936,0.14867,0.86245,0.99096,0.9887,0.99382,0.99105,0.99009,0.98783,0.99349,0.98964,0.11532,0.18185,0.10473,0.77706,0.003004,0.003004,0.003004 -108,11155.2,0.19543,0.2036,0.14753,0.86271,0.99089,0.9887,0.9938,0.99108,0.99002,0.98783,0.99349,0.98983,0.11502,0.18157,0.10491,0.77704,0.002938,0.002938,0.002938 -109,11254.4,0.19574,0.20854,0.14731,0.86331,0.99117,0.9887,0.9938,0.99111,0.9903,0.98783,0.99349,0.99033,0.11477,0.18158,0.10344,0.77694,0.002872,0.002872,0.002872 -110,11353.2,0.19467,0.20632,0.14752,0.86375,0.99123,0.9887,0.99371,0.99117,0.99035,0.98783,0.99344,0.9904,0.11454,0.18164,0.10356,0.77685,0.002806,0.002806,0.002806 -111,11451.9,0.19519,0.20673,0.14668,0.86527,0.99126,0.9887,0.99373,0.99114,0.99039,0.98783,0.99342,0.99039,0.11439,0.1819,0.10273,0.77671,0.00274,0.00274,0.00274 -112,11551.9,0.19518,0.20664,0.14639,0.86516,0.99138,0.9887,0.99369,0.99116,0.99051,0.98783,0.9934,0.99026,0.11426,0.18205,0.10282,0.77664,0.002674,0.002674,0.002674 -113,11650.2,0.19237,0.20567,0.14408,0.86097,0.9919,0.9887,0.99375,0.99126,0.99102,0.98783,0.99348,0.99029,0.11428,0.1821,0.1023,0.77659,0.002608,0.002608,0.002608 -114,11751.6,0.19364,0.20859,0.14529,0.86164,0.99063,0.9887,0.99379,0.99078,0.98976,0.98783,0.99351,0.99022,0.11414,0.18241,0.10206,0.77656,0.002542,0.002542,0.002542 -115,11851.6,0.19133,0.20368,0.14179,0.86322,0.99041,0.9887,0.9938,0.99073,0.98954,0.98783,0.99353,0.98979,0.11408,0.18219,0.10188,0.77652,0.002476,0.002476,0.002476 -116,11951.7,0.18858,0.20079,0.14123,0.8617,0.99053,0.98783,0.99382,0.99079,0.98966,0.98696,0.99352,0.9898,0.11395,0.18198,0.10164,0.77645,0.00241,0.00241,0.00241 diff --git a/rpi/training/result/edges-nano/results.png b/rpi/training/result/edges-nano/results.png deleted file mode 100644 index a661705c..00000000 Binary files a/rpi/training/result/edges-nano/results.png and /dev/null differ diff --git a/rpi/training/result/edges-nano/train_batch0.jpg b/rpi/training/result/edges-nano/train_batch0.jpg deleted file mode 100644 index 5ac06efe..00000000 Binary files a/rpi/training/result/edges-nano/train_batch0.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/train_batch1.jpg b/rpi/training/result/edges-nano/train_batch1.jpg deleted file mode 100644 index 6e968565..00000000 Binary files a/rpi/training/result/edges-nano/train_batch1.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/train_batch2.jpg b/rpi/training/result/edges-nano/train_batch2.jpg deleted file mode 100644 index 982d1945..00000000 Binary files a/rpi/training/result/edges-nano/train_batch2.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/val_batch0_labels.jpg b/rpi/training/result/edges-nano/val_batch0_labels.jpg deleted file mode 100644 index 75699ce7..00000000 Binary files a/rpi/training/result/edges-nano/val_batch0_labels.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/val_batch0_pred.jpg b/rpi/training/result/edges-nano/val_batch0_pred.jpg deleted file mode 100644 index 6058b1ab..00000000 Binary files a/rpi/training/result/edges-nano/val_batch0_pred.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/val_batch1_labels.jpg b/rpi/training/result/edges-nano/val_batch1_labels.jpg deleted file mode 100644 index b7985d29..00000000 Binary files a/rpi/training/result/edges-nano/val_batch1_labels.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/val_batch1_pred.jpg b/rpi/training/result/edges-nano/val_batch1_pred.jpg deleted file mode 100644 index d6ee6ef4..00000000 Binary files a/rpi/training/result/edges-nano/val_batch1_pred.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/val_batch2_labels.jpg b/rpi/training/result/edges-nano/val_batch2_labels.jpg deleted file mode 100644 index c3abf64a..00000000 Binary files a/rpi/training/result/edges-nano/val_batch2_labels.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/val_batch2_pred.jpg b/rpi/training/result/edges-nano/val_batch2_pred.jpg deleted file mode 100644 index bb289b99..00000000 Binary files a/rpi/training/result/edges-nano/val_batch2_pred.jpg and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/best.pt b/rpi/training/result/edges-nano/weights/best.pt deleted file mode 100644 index 3a2f0d89..00000000 Binary files a/rpi/training/result/edges-nano/weights/best.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch0.pt b/rpi/training/result/edges-nano/weights/epoch0.pt deleted file mode 100644 index 62e8f7ac..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch0.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch10.pt b/rpi/training/result/edges-nano/weights/epoch10.pt deleted file mode 100644 index ef3c9b84..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch10.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch100.pt b/rpi/training/result/edges-nano/weights/epoch100.pt deleted file mode 100644 index 3a933383..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch100.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch110.pt b/rpi/training/result/edges-nano/weights/epoch110.pt deleted file mode 100644 index 90635e20..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch110.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch20.pt b/rpi/training/result/edges-nano/weights/epoch20.pt deleted file mode 100644 index 5112e657..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch20.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch30.pt b/rpi/training/result/edges-nano/weights/epoch30.pt deleted file mode 100644 index 561d310b..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch30.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch40.pt b/rpi/training/result/edges-nano/weights/epoch40.pt deleted file mode 100644 index f8757bd7..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch40.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch50.pt b/rpi/training/result/edges-nano/weights/epoch50.pt deleted file mode 100644 index a6d865e0..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch50.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch60.pt b/rpi/training/result/edges-nano/weights/epoch60.pt deleted file mode 100644 index 255a9db8..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch60.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch70.pt b/rpi/training/result/edges-nano/weights/epoch70.pt deleted file mode 100644 index 603668bc..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch70.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch80.pt b/rpi/training/result/edges-nano/weights/epoch80.pt deleted file mode 100644 index 6e7b04b4..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch80.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/epoch90.pt b/rpi/training/result/edges-nano/weights/epoch90.pt deleted file mode 100644 index f4ce57e7..00000000 Binary files a/rpi/training/result/edges-nano/weights/epoch90.pt and /dev/null differ diff --git a/rpi/training/result/edges-nano/weights/last.pt b/rpi/training/result/edges-nano/weights/last.pt deleted file mode 100644 index a23ae547..00000000 Binary files a/rpi/training/result/edges-nano/weights/last.pt and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/BoxF1_curve.png b/rpi/training/result/unified-nano-refined/BoxF1_curve.png deleted file mode 100644 index 12fe4795..00000000 Binary files a/rpi/training/result/unified-nano-refined/BoxF1_curve.png and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/BoxPR_curve.png b/rpi/training/result/unified-nano-refined/BoxPR_curve.png deleted file mode 100644 index 7ee2654a..00000000 Binary files a/rpi/training/result/unified-nano-refined/BoxPR_curve.png and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/BoxP_curve.png b/rpi/training/result/unified-nano-refined/BoxP_curve.png deleted file mode 100644 index 09c998e9..00000000 Binary files a/rpi/training/result/unified-nano-refined/BoxP_curve.png and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/BoxR_curve.png b/rpi/training/result/unified-nano-refined/BoxR_curve.png deleted file mode 100644 index a34391bd..00000000 Binary files a/rpi/training/result/unified-nano-refined/BoxR_curve.png and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/confusion_matrix.png b/rpi/training/result/unified-nano-refined/confusion_matrix.png deleted file mode 100644 index 93ddcc58..00000000 Binary files a/rpi/training/result/unified-nano-refined/confusion_matrix.png and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/confusion_matrix_normalized.png b/rpi/training/result/unified-nano-refined/confusion_matrix_normalized.png deleted file mode 100644 index d625ba49..00000000 Binary files a/rpi/training/result/unified-nano-refined/confusion_matrix_normalized.png and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/results.png b/rpi/training/result/unified-nano-refined/results.png deleted file mode 100644 index 94721029..00000000 Binary files a/rpi/training/result/unified-nano-refined/results.png and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/train_batch474600.jpg b/rpi/training/result/unified-nano-refined/train_batch474600.jpg deleted file mode 100644 index c10adc90..00000000 Binary files a/rpi/training/result/unified-nano-refined/train_batch474600.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/train_batch474601.jpg b/rpi/training/result/unified-nano-refined/train_batch474601.jpg deleted file mode 100644 index ad574747..00000000 Binary files a/rpi/training/result/unified-nano-refined/train_batch474601.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/train_batch474602.jpg b/rpi/training/result/unified-nano-refined/train_batch474602.jpg deleted file mode 100644 index 0a038b3d..00000000 Binary files a/rpi/training/result/unified-nano-refined/train_batch474602.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/val_batch0_labels.jpg b/rpi/training/result/unified-nano-refined/val_batch0_labels.jpg deleted file mode 100644 index 6189e6c6..00000000 Binary files a/rpi/training/result/unified-nano-refined/val_batch0_labels.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/val_batch0_pred.jpg b/rpi/training/result/unified-nano-refined/val_batch0_pred.jpg deleted file mode 100644 index c19b5822..00000000 Binary files a/rpi/training/result/unified-nano-refined/val_batch0_pred.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/val_batch1_labels.jpg b/rpi/training/result/unified-nano-refined/val_batch1_labels.jpg deleted file mode 100644 index 47bc30c8..00000000 Binary files a/rpi/training/result/unified-nano-refined/val_batch1_labels.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/val_batch1_pred.jpg b/rpi/training/result/unified-nano-refined/val_batch1_pred.jpg deleted file mode 100644 index a20bd20d..00000000 Binary files a/rpi/training/result/unified-nano-refined/val_batch1_pred.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/val_batch2_labels.jpg b/rpi/training/result/unified-nano-refined/val_batch2_labels.jpg deleted file mode 100644 index 85e566fa..00000000 Binary files a/rpi/training/result/unified-nano-refined/val_batch2_labels.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/val_batch2_pred.jpg b/rpi/training/result/unified-nano-refined/val_batch2_pred.jpg deleted file mode 100644 index c1217007..00000000 Binary files a/rpi/training/result/unified-nano-refined/val_batch2_pred.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/weights/best.pt b/rpi/training/result/unified-nano-refined/weights/best.pt deleted file mode 100644 index 6fe4bfa0..00000000 Binary files a/rpi/training/result/unified-nano-refined/weights/best.pt and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/weights/epoch100.pt b/rpi/training/result/unified-nano-refined/weights/epoch100.pt deleted file mode 100644 index 6b9d0960..00000000 Binary files a/rpi/training/result/unified-nano-refined/weights/epoch100.pt and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/weights/epoch110.pt b/rpi/training/result/unified-nano-refined/weights/epoch110.pt deleted file mode 100644 index 7ba28ff3..00000000 Binary files a/rpi/training/result/unified-nano-refined/weights/epoch110.pt and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/weights/epoch120.pt b/rpi/training/result/unified-nano-refined/weights/epoch120.pt deleted file mode 100644 index 4437731b..00000000 Binary files a/rpi/training/result/unified-nano-refined/weights/epoch120.pt and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/weights/epoch130.pt b/rpi/training/result/unified-nano-refined/weights/epoch130.pt deleted file mode 100644 index e311df96..00000000 Binary files a/rpi/training/result/unified-nano-refined/weights/epoch130.pt and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/weights/epoch140.pt b/rpi/training/result/unified-nano-refined/weights/epoch140.pt deleted file mode 100644 index b30f0183..00000000 Binary files a/rpi/training/result/unified-nano-refined/weights/epoch140.pt and /dev/null differ diff --git a/rpi/training/result/unified-nano-refined/weights/last.pt b/rpi/training/result/unified-nano-refined/weights/last.pt deleted file mode 100644 index cd9a78e2..00000000 Binary files a/rpi/training/result/unified-nano-refined/weights/last.pt and /dev/null differ diff --git a/rpi/training/result/unified-nano/BoxF1_curve.png b/rpi/training/result/unified-nano/BoxF1_curve.png deleted file mode 100644 index 0237d529..00000000 Binary files a/rpi/training/result/unified-nano/BoxF1_curve.png and /dev/null differ diff --git a/rpi/training/result/unified-nano/BoxPR_curve.png b/rpi/training/result/unified-nano/BoxPR_curve.png deleted file mode 100644 index c19ae1d7..00000000 Binary files a/rpi/training/result/unified-nano/BoxPR_curve.png and /dev/null differ diff --git a/rpi/training/result/unified-nano/BoxP_curve.png b/rpi/training/result/unified-nano/BoxP_curve.png deleted file mode 100644 index 6e2136f0..00000000 Binary files a/rpi/training/result/unified-nano/BoxP_curve.png and /dev/null differ diff --git a/rpi/training/result/unified-nano/BoxR_curve.png b/rpi/training/result/unified-nano/BoxR_curve.png deleted file mode 100644 index 0efc0227..00000000 Binary files a/rpi/training/result/unified-nano/BoxR_curve.png and /dev/null differ diff --git a/rpi/training/result/unified-nano/args.yaml b/rpi/training/result/unified-nano/args.yaml deleted file mode 100644 index f6249711..00000000 --- a/rpi/training/result/unified-nano/args.yaml +++ /dev/null @@ -1,106 +0,0 @@ -task: detect -mode: train -model: models/yolo11n.pt -data: ./datasets/unified/data.yaml -epochs: 200 -time: null -patience: 30 -batch: 12 -imgsz: 640 -save: true -save_period: -1 -cache: false -device: '0' -workers: 8 -project: result -name: unified-training -exist_ok: true -pretrained: true -optimizer: auto -verbose: true -seed: 0 -deterministic: true -single_cls: false -rect: false -cos_lr: false -close_mosaic: 10 -resume: false -amp: true -fraction: 1.0 -profile: false -freeze: null -multi_scale: false -compile: false -overlap_mask: true -mask_ratio: 4 -dropout: 0.0 -val: true -split: val -save_json: false -conf: null -iou: 0.7 -max_det: 300 -half: false -dnn: false -plots: true -source: null -vid_stride: 1 -stream_buffer: false -visualize: false -augment: false -agnostic_nms: false -classes: null -retina_masks: false -embed: null -show: false -save_frames: false -save_txt: false -save_conf: false -save_crop: false -show_labels: true -show_conf: true -show_boxes: true -line_width: null -format: torchscript -keras: false -optimize: false -int8: false -dynamic: false -simplify: true -opset: null -workspace: null -nms: false -lr0: 0.01 -lrf: 0.01 -momentum: 0.937 -weight_decay: 0.0005 -warmup_epochs: 3.0 -warmup_momentum: 0.8 -warmup_bias_lr: 0.1 -box: 7.5 -cls: 0.5 -dfl: 1.5 -pose: 12.0 -kobj: 1.0 -nbs: 64 -hsv_h: 0.015 -hsv_s: 0.7 -hsv_v: 0.4 -degrees: 0.0 -translate: 0.1 -scale: 0.5 -shear: 0.0 -perspective: 0.0 -flipud: 0.0 -fliplr: 0.5 -bgr: 0.0 -mosaic: 1.0 -mixup: 0.0 -cutmix: 0.0 -copy_paste: 0.0 -copy_paste_mode: flip -auto_augment: randaugment -erasing: 0.4 -cfg: null -tracker: botsort.yaml -save_dir: C:\Users\Laurent\Desktop\board-mate\rpi\training\result\unified-training diff --git a/rpi/training/result/unified-nano/confusion_matrix.png b/rpi/training/result/unified-nano/confusion_matrix.png deleted file mode 100644 index f053a749..00000000 Binary files a/rpi/training/result/unified-nano/confusion_matrix.png and /dev/null differ diff --git a/rpi/training/result/unified-nano/confusion_matrix_normalized.png b/rpi/training/result/unified-nano/confusion_matrix_normalized.png deleted file mode 100644 index 67847709..00000000 Binary files a/rpi/training/result/unified-nano/confusion_matrix_normalized.png and /dev/null differ diff --git a/rpi/training/result/unified-nano/labels.jpg b/rpi/training/result/unified-nano/labels.jpg deleted file mode 100644 index 5c87db46..00000000 Binary files a/rpi/training/result/unified-nano/labels.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/results.csv b/rpi/training/result/unified-nano/results.csv deleted file mode 100644 index 45f825c4..00000000 --- a/rpi/training/result/unified-nano/results.csv +++ /dev/null @@ -1,201 +0,0 @@ -epoch,time,train/box_loss,train/cls_loss,train/dfl_loss,metrics/precision(B),metrics/recall(B),metrics/mAP50(B),metrics/mAP50-95(B),val/box_loss,val/cls_loss,val/dfl_loss,lr/pg0,lr/pg1,lr/pg2 -1,387.074,1.54135,2.249,1.22945,0.56834,0.67345,0.59013,0.36616,1.33114,1.37185,1.26692,0.00333233,0.00333233,0.00333233 -2,784.042,1.39816,1.48273,1.16556,0.69801,0.7264,0.73772,0.47791,1.27288,1.11363,1.22931,0.00663267,0.00663267,0.00663267 -3,1165.34,1.37564,1.35535,1.1369,0.74141,0.73593,0.7686,0.5011,1.26132,1.04966,1.20057,0.00990001,0.00990001,0.00990001 -4,1547.23,1.34984,1.26506,1.11352,0.79277,0.77083,0.81105,0.54335,1.22806,0.90764,1.15669,0.0098515,0.0098515,0.0098515 -5,1933.74,1.30709,1.16458,1.08535,0.83504,0.78384,0.84333,0.57119,1.20297,0.81422,1.13262,0.009802,0.009802,0.009802 -6,2314.5,1.2783,1.09528,1.06905,0.84057,0.80746,0.85442,0.58529,1.17929,0.76579,1.12204,0.0097525,0.0097525,0.0097525 -7,2701.44,1.25912,1.05677,1.0595,0.85394,0.81041,0.86402,0.594,1.16945,0.73629,1.11388,0.009703,0.009703,0.009703 -8,3088.63,1.24198,1.02315,1.0497,0.87621,0.8176,0.87362,0.60549,1.15063,0.70447,1.10297,0.0096535,0.0096535,0.0096535 -9,3470.46,1.22953,1.00064,1.04537,0.87753,0.82792,0.87625,0.61221,1.13665,0.67866,1.09384,0.009604,0.009604,0.009604 -10,3851.1,1.21881,0.97735,1.03972,0.88893,0.82854,0.88463,0.61992,1.12885,0.66714,1.08698,0.0095545,0.0095545,0.0095545 -11,4233.49,1.21282,0.96904,1.03596,0.89095,0.83323,0.88558,0.6247,1.11411,0.65207,1.07961,0.009505,0.009505,0.009505 -12,4616.67,1.20187,0.95111,1.03052,0.88547,0.84135,0.88672,0.63328,1.08935,0.63966,1.06848,0.0094555,0.0094555,0.0094555 -13,5000.29,1.19383,0.94615,1.02721,0.89592,0.84269,0.89072,0.63885,1.08179,0.62822,1.06381,0.009406,0.009406,0.009406 -14,5377.32,1.18517,0.93859,1.02283,0.89876,0.84111,0.89159,0.6402,1.07666,0.62622,1.06023,0.0093565,0.0093565,0.0093565 -15,5750.2,1.17877,0.92156,1.01921,0.90101,0.84185,0.89203,0.64277,1.07085,0.61489,1.05477,0.009307,0.009307,0.009307 -16,6127.21,1.17622,0.91773,1.01664,0.90304,0.84476,0.89433,0.64575,1.06439,0.60887,1.05182,0.0092575,0.0092575,0.0092575 -17,6504.99,1.16711,0.90912,1.01357,0.9012,0.84905,0.89537,0.64806,1.05778,0.60524,1.04919,0.009208,0.009208,0.009208 -18,6900.64,1.16465,0.90184,1.01353,0.90181,0.85085,0.89579,0.64951,1.053,0.59944,1.04613,0.0091585,0.0091585,0.0091585 -19,7301.08,1.15978,0.8963,1.01033,0.90537,0.85051,0.89671,0.65143,1.04909,0.59652,1.04367,0.009109,0.009109,0.009109 -20,7708.07,1.1554,0.8919,1.00774,0.90847,0.84966,0.89751,0.65208,1.0471,0.59352,1.04185,0.0090595,0.0090595,0.0090595 -21,8115.23,1.15368,0.88704,1.00851,0.90991,0.84988,0.89801,0.65341,1.04493,0.59069,1.04107,0.00901,0.00901,0.00901 -22,8525.53,1.14982,0.88713,1.00604,0.91219,0.84936,0.89859,0.65432,1.04312,0.58909,1.04013,0.0089605,0.0089605,0.0089605 -23,8936.32,1.14372,0.87668,1.0034,0.91337,0.84911,0.89921,0.6554,1.04104,0.58682,1.03915,0.008911,0.008911,0.008911 -24,9342.14,1.14249,0.87387,1.00257,0.91423,0.84981,0.89973,0.65613,1.03913,0.58478,1.03817,0.0088615,0.0088615,0.0088615 -25,9746.49,1.13734,0.87047,1.00072,0.91366,0.85107,0.90009,0.65671,1.03762,0.58281,1.03719,0.008812,0.008812,0.008812 -26,10137.1,1.13697,0.8669,1.00021,0.91379,0.85191,0.90036,0.65729,1.03598,0.58113,1.03629,0.0087625,0.0087625,0.0087625 -27,10619.2,1.13603,0.86501,0.99951,0.91506,0.85187,0.90063,0.65806,1.03462,0.57935,1.03555,0.008713,0.008713,0.008713 -28,11165.9,1.1351,0.86129,0.9988,0.915,0.85292,0.90094,0.65866,1.03352,0.57796,1.03481,0.0086635,0.0086635,0.0086635 -29,11663.5,1.12921,0.85704,0.99725,0.91483,0.85357,0.90123,0.65923,1.03238,0.57688,1.03423,0.008614,0.008614,0.008614 -30,12034.2,1.12876,0.85636,0.99732,0.91792,0.85217,0.90147,0.65976,1.03119,0.57544,1.03344,0.0085645,0.0085645,0.0085645 -31,12401.5,1.12578,0.85306,0.99566,0.91902,0.85182,0.90179,0.66029,1.03,0.57439,1.03272,0.008515,0.008515,0.008515 -32,12770.2,1.12534,0.84938,0.99476,0.91993,0.85148,0.90216,0.66108,1.02879,0.57293,1.03195,0.0084655,0.0084655,0.0084655 -33,13148.2,1.12078,0.84847,0.99323,0.92082,0.85197,0.90252,0.66174,1.02762,0.57172,1.03132,0.008416,0.008416,0.008416 -34,13531,1.12241,0.84556,0.99309,0.9202,0.85336,0.90267,0.66231,1.02651,0.57023,1.03066,0.0083665,0.0083665,0.0083665 -35,13900.1,1.11806,0.8405,0.9924,0.92225,0.85241,0.90286,0.6628,1.02579,0.56958,1.03022,0.008317,0.008317,0.008317 -36,14268.1,1.11719,0.84149,0.99192,0.92165,0.85306,0.90311,0.66329,1.02455,0.56832,1.02958,0.0082675,0.0082675,0.0082675 -37,14649.3,1.11641,0.84061,0.99077,0.92157,0.85379,0.90341,0.66373,1.02339,0.56689,1.02896,0.008218,0.008218,0.008218 -38,15022.9,1.11421,0.83634,0.99017,0.92124,0.85473,0.90352,0.6642,1.02211,0.56533,1.02831,0.0081685,0.0081685,0.0081685 -39,15403.7,1.11692,0.83423,0.99093,0.92288,0.85375,0.90376,0.66459,1.02113,0.56424,1.02762,0.008119,0.008119,0.008119 -40,15784.3,1.11144,0.83242,0.98912,0.92354,0.85361,0.90384,0.66512,1.02015,0.56286,1.02695,0.0080695,0.0080695,0.0080695 -41,16167.1,1.1094,0.83134,0.98814,0.92376,0.85416,0.90401,0.66557,1.01906,0.5619,1.0262,0.00802,0.00802,0.00802 -42,16551.5,1.11004,0.82936,0.98819,0.92484,0.85449,0.90407,0.66588,1.01816,0.5608,1.02553,0.0079705,0.0079705,0.0079705 -43,16919,1.10806,0.82789,0.98839,0.92504,0.8547,0.90426,0.66648,1.01706,0.56019,1.02472,0.007921,0.007921,0.007921 -44,17278.5,1.10426,0.82016,0.986,0.92566,0.85479,0.9045,0.667,1.0161,0.55929,1.02399,0.0078715,0.0078715,0.0078715 -45,17654.3,1.1051,0.82223,0.98627,0.92601,0.85531,0.90462,0.66742,1.01534,0.55826,1.02342,0.007822,0.007822,0.007822 -46,18048.6,1.10531,0.82358,0.98665,0.92804,0.85436,0.90478,0.66786,1.01463,0.5573,1.02289,0.0077725,0.0077725,0.0077725 -47,18413.5,1.10193,0.81829,0.98553,0.9289,0.85387,0.90495,0.66833,1.01396,0.55655,1.02217,0.007723,0.007723,0.007723 -48,18852.5,1.10089,0.81843,0.98506,0.92946,0.85439,0.90515,0.66882,1.01297,0.5554,1.02152,0.0076735,0.0076735,0.0076735 -49,19243.8,1.09929,0.81562,0.98555,0.92996,0.85446,0.90529,0.66914,1.01223,0.55424,1.02099,0.007624,0.007624,0.007624 -50,19634.3,1.10232,0.81414,0.98493,0.93078,0.85468,0.90547,0.66968,1.01157,0.55366,1.02026,0.0075745,0.0075745,0.0075745 -51,20024.6,1.09908,0.81642,0.98522,0.93252,0.85413,0.90549,0.66988,1.01088,0.55252,1.01964,0.007525,0.007525,0.007525 -52,20413.3,1.09525,0.81007,0.98347,0.93383,0.85417,0.90575,0.67019,1.00985,0.5513,1.01883,0.0074755,0.0074755,0.0074755 -53,20891.1,1.09673,0.80907,0.98288,0.93345,0.85467,0.90579,0.67057,1.0089,0.55045,1.01806,0.007426,0.007426,0.007426 -54,21376.7,1.09572,0.80743,0.9829,0.93392,0.85486,0.90591,0.671,1.00825,0.54973,1.0174,0.0073765,0.0073765,0.0073765 -55,21769.9,1.09209,0.80945,0.98239,0.93451,0.85532,0.906,0.67148,1.00755,0.54884,1.01663,0.007327,0.007327,0.007327 -56,22159.7,1.09288,0.80433,0.98168,0.93495,0.8558,0.90618,0.67198,1.00648,0.54699,1.01585,0.0072775,0.0072775,0.0072775 -57,22556,1.09303,0.80478,0.98257,0.93485,0.85637,0.90623,0.67231,1.00585,0.54553,1.01528,0.007228,0.007228,0.007228 -58,22943.6,1.09143,0.80066,0.98133,0.93582,0.85645,0.90633,0.67271,1.00496,0.54469,1.01477,0.0071785,0.0071785,0.0071785 -59,23329.9,1.09125,0.80418,0.98185,0.93659,0.85655,0.90654,0.67294,1.00413,0.54303,1.01407,0.007129,0.007129,0.007129 -60,23719.3,1.08502,0.79668,0.97872,0.93713,0.85638,0.90674,0.67338,1.00347,0.5421,1.01351,0.0070795,0.0070795,0.0070795 -61,24122.6,1.08508,0.79801,0.97758,0.93795,0.85629,0.90687,0.67378,1.00281,0.54097,1.01284,0.00703,0.00703,0.00703 -62,24523.5,1.08701,0.79921,0.97986,0.93791,0.85639,0.90698,0.67408,1.00206,0.54003,1.0122,0.0069805,0.0069805,0.0069805 -63,24919.2,1.08329,0.79662,0.97884,0.93876,0.85636,0.90704,0.67445,1.00115,0.53914,1.01165,0.006931,0.006931,0.006931 -64,25320.7,1.08157,0.79609,0.97877,0.93913,0.85664,0.9073,0.67481,1.00034,0.53834,1.01089,0.0068815,0.0068815,0.0068815 -65,25715.8,1.08358,0.79559,0.97847,0.93969,0.85685,0.90752,0.67526,0.99967,0.53721,1.01014,0.006832,0.006832,0.006832 -66,26151.5,1.08562,0.79828,0.97917,0.94055,0.85687,0.90764,0.67539,0.99894,0.53619,1.00964,0.0067825,0.0067825,0.0067825 -67,26530.7,1.08082,0.79387,0.97911,0.94115,0.8566,0.90777,0.67588,0.99831,0.53515,1.0092,0.006733,0.006733,0.006733 -68,26954.8,1.07998,0.79368,0.9787,0.94073,0.85735,0.90779,0.67618,0.99785,0.53446,1.00887,0.0066835,0.0066835,0.0066835 -69,27474,1.07717,0.78887,0.97679,0.94061,0.8583,0.90793,0.67661,0.99721,0.53361,1.00811,0.006634,0.006634,0.006634 -70,27843.9,1.07878,0.78739,0.97595,0.94142,0.8582,0.90799,0.67696,0.99638,0.53268,1.0075,0.0065845,0.0065845,0.0065845 -71,28208.7,1.08077,0.78718,0.97676,0.94091,0.85907,0.90808,0.67734,0.99552,0.53173,1.00691,0.006535,0.006535,0.006535 -72,28573.4,1.0796,0.78524,0.97743,0.9414,0.85971,0.90808,0.6776,0.99477,0.53098,1.00623,0.0064855,0.0064855,0.0064855 -73,28937.5,1.07668,0.78862,0.97504,0.94228,0.85976,0.90818,0.67798,0.99401,0.52984,1.00547,0.006436,0.006436,0.006436 -74,29294.9,1.07441,0.78503,0.97549,0.94273,0.86024,0.90831,0.67848,0.99319,0.52887,1.00482,0.0063865,0.0063865,0.0063865 -75,29656.4,1.07226,0.78286,0.97437,0.94292,0.86033,0.9084,0.67868,0.99265,0.52796,1.00417,0.006337,0.006337,0.006337 -76,30088.2,1.07542,0.78448,0.97552,0.94334,0.86042,0.9085,0.67913,0.99208,0.527,1.00367,0.0062875,0.0062875,0.0062875 -77,30504.6,1.07317,0.78009,0.97482,0.94321,0.86082,0.9086,0.67933,0.99155,0.52625,1.00324,0.006238,0.006238,0.006238 -78,30864.9,1.07024,0.78015,0.97357,0.94341,0.86119,0.90873,0.67984,0.99104,0.5257,1.00269,0.0061885,0.0061885,0.0061885 -79,31231.8,1.07257,0.77927,0.97414,0.94309,0.86146,0.90883,0.68026,0.99048,0.52506,1.00188,0.006139,0.006139,0.006139 -80,31595.9,1.07031,0.77456,0.97213,0.9434,0.86169,0.9089,0.6805,0.99009,0.52431,1.00134,0.0060895,0.0060895,0.0060895 -81,31960.3,1.06834,0.77738,0.97308,0.94321,0.86217,0.90899,0.68088,0.98943,0.52383,1.00083,0.00604,0.00604,0.00604 -82,32335.4,1.07021,0.77843,0.97348,0.94329,0.86268,0.90921,0.68117,0.98885,0.52311,1.00019,0.0059905,0.0059905,0.0059905 -83,32731.2,1.06682,0.77537,0.97269,0.94293,0.86304,0.90928,0.68147,0.9883,0.5225,0.99974,0.005941,0.005941,0.005941 -84,33117.1,1.06572,0.77023,0.97148,0.94272,0.86383,0.90934,0.68166,0.98781,0.52186,0.9991,0.0058915,0.0058915,0.0058915 -85,33498.3,1.06636,0.77628,0.97252,0.94263,0.86448,0.90955,0.68199,0.98746,0.52114,0.99875,0.005842,0.005842,0.005842 -86,33880.3,1.06399,0.76926,0.97116,0.94255,0.86434,0.90963,0.6822,0.98685,0.52028,0.9982,0.0057925,0.0057925,0.0057925 -87,34264.4,1.06566,0.77226,0.97192,0.94267,0.8648,0.90979,0.68247,0.98667,0.51953,0.99802,0.005743,0.005743,0.005743 -88,34648.2,1.06342,0.7702,0.96955,0.94222,0.86544,0.90979,0.68275,0.98641,0.51925,0.9976,0.0056935,0.0056935,0.0056935 -89,35030.9,1.06352,0.76647,0.971,0.9428,0.86513,0.90974,0.68293,0.98604,0.51854,0.9972,0.005644,0.005644,0.005644 -90,35412,1.06335,0.76641,0.97104,0.94242,0.86585,0.90975,0.68328,0.98562,0.51821,0.99682,0.0055945,0.0055945,0.0055945 -91,35793.8,1.06078,0.76719,0.97053,0.94205,0.8663,0.90985,0.68362,0.98475,0.51743,0.99608,0.005545,0.005545,0.005545 -92,36175.3,1.06008,0.76809,0.96953,0.94225,0.86649,0.90998,0.68389,0.98441,0.51652,0.99566,0.0054955,0.0054955,0.0054955 -93,36556.7,1.06228,0.76678,0.97099,0.94318,0.86605,0.9101,0.68408,0.98418,0.51615,0.99534,0.005446,0.005446,0.005446 -94,36941.6,1.0563,0.75804,0.96813,0.94374,0.86549,0.9102,0.68447,0.9834,0.51529,0.9949,0.0053965,0.0053965,0.0053965 -95,37323.8,1.05683,0.76068,0.96909,0.94376,0.86554,0.91031,0.6847,0.9829,0.5148,0.99438,0.005347,0.005347,0.005347 -96,37708.4,1.05559,0.75825,0.96841,0.9438,0.86586,0.91029,0.68484,0.98253,0.51415,0.99403,0.0052975,0.0052975,0.0052975 -97,38093.9,1.0567,0.76148,0.96849,0.94411,0.86609,0.9104,0.68506,0.98223,0.51394,0.99379,0.005248,0.005248,0.005248 -98,38480.1,1.05594,0.75677,0.96858,0.94438,0.86618,0.91048,0.68525,0.98192,0.51366,0.99341,0.0051985,0.0051985,0.0051985 -99,38863.5,1.05323,0.75696,0.96789,0.94451,0.86613,0.91056,0.6855,0.98144,0.51322,0.99288,0.005149,0.005149,0.005149 -100,39419.8,1.05298,0.75681,0.96702,0.94499,0.86593,0.91062,0.68567,0.98111,0.51323,0.99242,0.0050995,0.0050995,0.0050995 -101,39803.4,1.05262,0.75809,0.96782,0.94514,0.8658,0.9108,0.68577,0.98069,0.51288,0.99207,0.00505,0.00505,0.00505 -102,40186.8,1.05373,0.7568,0.96737,0.94441,0.86664,0.91082,0.68602,0.98024,0.51211,0.99166,0.0050005,0.0050005,0.0050005 -103,40573.2,1.05226,0.75694,0.9674,0.94422,0.86714,0.91089,0.68621,0.97982,0.51155,0.99124,0.004951,0.004951,0.004951 -104,40993.3,1.0533,0.75373,0.96739,0.94435,0.86718,0.911,0.68647,0.97952,0.51093,0.99093,0.0049015,0.0049015,0.0049015 -105,41570.4,1.04765,0.7531,0.96593,0.9458,0.86623,0.91096,0.68664,0.97898,0.5105,0.99062,0.004852,0.004852,0.004852 -106,42092.9,1.0505,0.75415,0.96654,0.9456,0.86673,0.9111,0.68687,0.97853,0.51009,0.99033,0.0048025,0.0048025,0.0048025 -107,42482,1.04624,0.7511,0.96535,0.94511,0.86702,0.9111,0.68694,0.97837,0.50984,0.98997,0.004753,0.004753,0.004753 -108,42871.3,1.04777,0.75029,0.96513,0.94542,0.8668,0.91109,0.68711,0.97816,0.50961,0.98965,0.0047035,0.0047035,0.0047035 -109,43264.7,1.04749,0.7482,0.96464,0.94601,0.86616,0.91108,0.68738,0.97797,0.50946,0.98922,0.004654,0.004654,0.004654 -110,43641.7,1.04497,0.74572,0.96514,0.94553,0.86644,0.91116,0.68756,0.97736,0.50915,0.98876,0.0046045,0.0046045,0.0046045 -111,44023.5,1.04476,0.74684,0.96389,0.94559,0.86664,0.91127,0.6877,0.9769,0.50889,0.98841,0.004555,0.004555,0.004555 -112,44410.8,1.04327,0.74367,0.9634,0.94582,0.86679,0.91128,0.68774,0.97653,0.5085,0.98797,0.0045055,0.0045055,0.0045055 -113,44796.8,1.04223,0.74269,0.9638,0.94565,0.86721,0.91136,0.68793,0.97644,0.50813,0.98765,0.004456,0.004456,0.004456 -114,45182.7,1.03992,0.74263,0.96327,0.94551,0.86738,0.9115,0.68827,0.97612,0.50767,0.98733,0.0044065,0.0044065,0.0044065 -115,45572.1,1.04063,0.73976,0.9636,0.94584,0.86761,0.91159,0.68842,0.97542,0.5073,0.98702,0.004357,0.004357,0.004357 -116,45961.3,1.04146,0.74198,0.96347,0.94648,0.86786,0.91173,0.68857,0.97506,0.50679,0.98677,0.0043075,0.0043075,0.0043075 -117,46367.8,1.03854,0.7381,0.96205,0.94662,0.86767,0.91179,0.68875,0.97476,0.50645,0.98652,0.004258,0.004258,0.004258 -118,46755.2,1.04016,0.73999,0.96308,0.94677,0.86765,0.9118,0.68879,0.97438,0.50631,0.98627,0.0042085,0.0042085,0.0042085 -119,47144.5,1.03722,0.7363,0.96312,0.94639,0.86757,0.91165,0.68889,0.97408,0.50604,0.98607,0.004159,0.004159,0.004159 -120,47532.7,1.03819,0.73661,0.9629,0.94581,0.86792,0.91172,0.68909,0.97389,0.50577,0.986,0.0041095,0.0041095,0.0041095 -121,47919.7,1.03418,0.73689,0.96115,0.94734,0.8671,0.91187,0.68934,0.97353,0.50564,0.9857,0.00406,0.00406,0.00406 -122,48304.1,1.03435,0.7325,0.96066,0.94655,0.86779,0.91201,0.68955,0.97332,0.50536,0.9854,0.0040105,0.0040105,0.0040105 -123,48672.2,1.0339,0.73304,0.96,0.94747,0.86731,0.91212,0.68974,0.97296,0.50501,0.98512,0.003961,0.003961,0.003961 -124,49040.4,1.03223,0.72921,0.95974,0.9468,0.86772,0.91217,0.69004,0.97274,0.50459,0.98486,0.0039115,0.0039115,0.0039115 -125,49408.2,1.0341,0.73242,0.96,0.9467,0.86837,0.9122,0.69015,0.97266,0.50416,0.9847,0.003862,0.003862,0.003862 -126,49784.7,1.03182,0.73039,0.95989,0.94707,0.86807,0.91226,0.69035,0.97233,0.50381,0.98441,0.0038125,0.0038125,0.0038125 -127,50234.1,1.03057,0.72791,0.95967,0.94691,0.86849,0.91234,0.69054,0.9719,0.50329,0.98418,0.003763,0.003763,0.003763 -128,50649.4,1.02891,0.72826,0.95874,0.94592,0.86925,0.91235,0.69088,0.97141,0.50282,0.98396,0.0037135,0.0037135,0.0037135 -129,51027.9,1.03088,0.72985,0.95897,0.94654,0.86912,0.91243,0.69099,0.97113,0.5026,0.98374,0.003664,0.003664,0.003664 -130,51397.8,1.02951,0.72674,0.95881,0.94675,0.86896,0.91243,0.69106,0.9709,0.50257,0.98345,0.0036145,0.0036145,0.0036145 -131,51769.2,1.0275,0.72663,0.95826,0.94683,0.8689,0.91238,0.69127,0.9702,0.50223,0.98286,0.003565,0.003565,0.003565 -132,52159.1,1.02612,0.72065,0.9574,0.94698,0.86869,0.91245,0.69148,0.96971,0.50191,0.98259,0.0035155,0.0035155,0.0035155 -133,52566.8,1.02638,0.72293,0.958,0.94738,0.86866,0.91246,0.69164,0.9694,0.50132,0.98231,0.003466,0.003466,0.003466 -134,52940,1.02518,0.72275,0.95777,0.94724,0.86887,0.91255,0.69174,0.96918,0.5011,0.9821,0.0034165,0.0034165,0.0034165 -135,53309,1.02277,0.71909,0.95747,0.9477,0.86876,0.91259,0.69183,0.96874,0.50094,0.98173,0.003367,0.003367,0.003367 -136,53677.7,1.0265,0.726,0.95847,0.94733,0.86951,0.91258,0.69191,0.96849,0.50084,0.9816,0.0033175,0.0033175,0.0033175 -137,54048.3,1.01992,0.71742,0.95651,0.94658,0.87051,0.91263,0.69207,0.9682,0.50056,0.98136,0.003268,0.003268,0.003268 -138,54417.7,1.01813,0.71421,0.9561,0.94651,0.87054,0.91252,0.69234,0.96757,0.50004,0.98097,0.0032185,0.0032185,0.0032185 -139,54789.1,1.01993,0.71707,0.9554,0.94577,0.87117,0.91258,0.69249,0.96709,0.49981,0.98057,0.003169,0.003169,0.003169 -140,55157.4,1.01611,0.71153,0.95583,0.94538,0.87172,0.91253,0.69264,0.96689,0.49925,0.98048,0.0031195,0.0031195,0.0031195 -141,55527.2,1.01735,0.71457,0.95532,0.94599,0.87157,0.91266,0.69278,0.9665,0.499,0.98025,0.00307,0.00307,0.00307 -142,55900.5,1.01572,0.71535,0.95457,0.94618,0.87157,0.9127,0.69271,0.96639,0.49914,0.98015,0.0030205,0.0030205,0.0030205 -143,56271.1,1.01253,0.71174,0.95415,0.94691,0.87101,0.91276,0.69297,0.96605,0.49918,0.9799,0.002971,0.002971,0.002971 -144,56673.8,1.01214,0.70952,0.95423,0.94712,0.871,0.91287,0.69322,0.96569,0.49904,0.97963,0.0029215,0.0029215,0.0029215 -145,57036.1,1.01236,0.70785,0.95411,0.94682,0.87088,0.91297,0.69342,0.96511,0.49852,0.97947,0.002872,0.002872,0.002872 -146,57393.7,1.0129,0.70737,0.95355,0.94652,0.87079,0.91305,0.6935,0.9646,0.49829,0.97914,0.0028225,0.0028225,0.0028225 -147,57752.4,1.01156,0.70568,0.95257,0.94687,0.87082,0.9132,0.69355,0.96434,0.49794,0.97893,0.002773,0.002773,0.002773 -148,58116.3,1.01122,0.70574,0.95359,0.94601,0.8714,0.91316,0.69351,0.96416,0.49761,0.97861,0.0027235,0.0027235,0.0027235 -149,58477.4,1.00715,0.70317,0.9519,0.94599,0.87152,0.91314,0.69386,0.96371,0.49725,0.97837,0.002674,0.002674,0.002674 -150,58851.4,1.00911,0.70364,0.95277,0.94624,0.87107,0.91326,0.69405,0.96342,0.49696,0.97833,0.0026245,0.0026245,0.0026245 -151,59233.5,1.00966,0.7035,0.95239,0.94734,0.87024,0.91323,0.69426,0.9632,0.49677,0.97811,0.002575,0.002575,0.002575 -152,59617.7,1.00583,0.7016,0.95094,0.94707,0.8706,0.91333,0.6944,0.96302,0.49613,0.978,0.0025255,0.0025255,0.0025255 -153,60001.7,1.0066,0.70014,0.95076,0.94793,0.87018,0.91344,0.69468,0.96262,0.49585,0.97785,0.002476,0.002476,0.002476 -154,60383.8,1.00302,0.69818,0.95088,0.94894,0.86952,0.91347,0.69495,0.96221,0.49542,0.97775,0.0024265,0.0024265,0.0024265 -155,60768.1,1.00319,0.69821,0.95181,0.94955,0.86941,0.91353,0.69524,0.96166,0.49512,0.97757,0.002377,0.002377,0.002377 -156,61151.6,1.00393,0.69416,0.95128,0.94965,0.86944,0.91362,0.69542,0.96132,0.49494,0.97744,0.0023275,0.0023275,0.0023275 -157,61534.3,1.00205,0.69411,0.95015,0.94931,0.86957,0.91369,0.6956,0.96113,0.49461,0.97723,0.002278,0.002278,0.002278 -158,61917.3,1.00122,0.69456,0.94907,0.94935,0.86974,0.91391,0.69583,0.96098,0.49417,0.97696,0.0022285,0.0022285,0.0022285 -159,62300,0.99761,0.68917,0.94806,0.94863,0.87064,0.91388,0.69614,0.96087,0.49421,0.97677,0.002179,0.002179,0.002179 -160,62682.6,0.9975,0.69104,0.94908,0.9486,0.87101,0.91401,0.69647,0.9605,0.49382,0.97646,0.0021295,0.0021295,0.0021295 -161,63066.3,0.99514,0.68634,0.94828,0.94991,0.87017,0.91421,0.69675,0.96021,0.49363,0.97609,0.00208,0.00208,0.00208 -162,63449,0.99532,0.68594,0.94801,0.95085,0.86976,0.91428,0.69705,0.95992,0.49321,0.97593,0.0020305,0.0020305,0.0020305 -163,63832.1,0.9932,0.68492,0.94767,0.95003,0.87022,0.91427,0.69725,0.95974,0.4933,0.97587,0.001981,0.001981,0.001981 -164,64215.9,0.99204,0.68295,0.94682,0.95026,0.87019,0.91432,0.69749,0.95946,0.493,0.97565,0.0019315,0.0019315,0.0019315 -165,64599.3,0.99298,0.68411,0.94683,0.95042,0.87036,0.91441,0.69751,0.95941,0.49299,0.97566,0.001882,0.001882,0.001882 -166,64983,0.99121,0.68264,0.94703,0.95021,0.87066,0.91449,0.69766,0.95931,0.49266,0.9756,0.0018325,0.0018325,0.0018325 -167,65366.6,0.98831,0.67835,0.94581,0.95039,0.87043,0.91439,0.69787,0.95912,0.49235,0.97551,0.001783,0.001783,0.001783 -168,65749.9,0.98778,0.6779,0.94405,0.95019,0.87102,0.91456,0.69826,0.95861,0.49215,0.9752,0.0017335,0.0017335,0.0017335 -169,66133.7,0.98531,0.67835,0.94452,0.94997,0.87149,0.91468,0.69853,0.95818,0.49189,0.97504,0.001684,0.001684,0.001684 -170,66516.4,0.98374,0.67366,0.9438,0.94993,0.87118,0.91461,0.69862,0.95775,0.49172,0.97486,0.0016345,0.0016345,0.0016345 -171,66899.7,0.98467,0.67251,0.94443,0.95069,0.87118,0.91469,0.69884,0.95726,0.4913,0.97452,0.001585,0.001585,0.001585 -172,67283.3,0.98189,0.67053,0.94353,0.95017,0.8716,0.91477,0.699,0.9568,0.49099,0.97421,0.0015355,0.0015355,0.0015355 -173,67665.9,0.98138,0.67013,0.94359,0.95033,0.87144,0.91482,0.69907,0.95633,0.49076,0.97395,0.001486,0.001486,0.001486 -174,68048.4,0.97824,0.66907,0.94297,0.95179,0.87027,0.91497,0.69933,0.95608,0.49047,0.97373,0.0014365,0.0014365,0.0014365 -175,68430.2,0.9795,0.66876,0.94197,0.95165,0.87007,0.91501,0.69942,0.95582,0.49015,0.9735,0.001387,0.001387,0.001387 -176,68813.6,0.9791,0.66849,0.94268,0.95115,0.87066,0.91506,0.69957,0.95556,0.48963,0.97319,0.0013375,0.0013375,0.0013375 -177,69198.8,0.97586,0.66709,0.94169,0.95203,0.86986,0.91512,0.69982,0.95525,0.48935,0.97291,0.001288,0.001288,0.001288 -178,69581.9,0.97729,0.66396,0.94241,0.9529,0.86954,0.91514,0.69988,0.95481,0.48891,0.97263,0.0012385,0.0012385,0.0012385 -179,69965.8,0.97436,0.66223,0.94111,0.95211,0.87052,0.91517,0.70014,0.95441,0.48864,0.9724,0.001189,0.001189,0.001189 -180,70348.4,0.96962,0.65873,0.93972,0.9514,0.87101,0.91513,0.70028,0.95419,0.48846,0.97225,0.0011395,0.0011395,0.0011395 -181,70731.5,0.96976,0.6588,0.93919,0.9512,0.87119,0.91511,0.70045,0.95417,0.48838,0.97214,0.00109,0.00109,0.00109 -182,71111.7,0.97061,0.65657,0.93963,0.95023,0.8722,0.91511,0.70065,0.95408,0.48825,0.97199,0.0010405,0.0010405,0.0010405 -183,71494.7,0.96786,0.65543,0.93881,0.94983,0.8725,0.91519,0.70085,0.95378,0.48819,0.97176,0.000991,0.000991,0.000991 -184,71875.9,0.96796,0.65486,0.93848,0.94876,0.87336,0.9152,0.70106,0.95329,0.48771,0.9714,0.0009415,0.0009415,0.0009415 -185,72258.8,0.96234,0.6496,0.93799,0.94852,0.87366,0.91532,0.70131,0.95286,0.48769,0.97125,0.000892,0.000892,0.000892 -186,72641.7,0.96355,0.65094,0.93773,0.94882,0.8736,0.9154,0.70145,0.95239,0.48736,0.97107,0.0008425,0.0008425,0.0008425 -187,73026.1,0.96211,0.649,0.93795,0.94783,0.87434,0.91535,0.70163,0.9519,0.48708,0.97087,0.000793,0.000793,0.000793 -188,73410.8,0.95788,0.64545,0.93539,0.94728,0.87489,0.91556,0.70194,0.95165,0.48676,0.97062,0.0007435,0.0007435,0.0007435 -189,73793.8,0.95877,0.64364,0.93566,0.94848,0.87409,0.9156,0.70218,0.95121,0.48634,0.97037,0.000694,0.000694,0.000694 -190,74176.3,0.9566,0.64378,0.93535,0.94796,0.87436,0.91559,0.70226,0.95103,0.48615,0.97016,0.0006445,0.0006445,0.0006445 -191,74567.9,0.93471,0.57105,0.94238,0.94826,0.87429,0.9157,0.70241,0.95054,0.48575,0.97006,0.000595,0.000595,0.000595 -192,74931.5,0.92816,0.56319,0.94049,0.94775,0.87494,0.91563,0.70251,0.95002,0.48541,0.96982,0.0005455,0.0005455,0.0005455 -193,75296.4,0.92645,0.56294,0.9394,0.94844,0.87434,0.91559,0.70271,0.9495,0.48516,0.96951,0.000496,0.000496,0.000496 -194,75660,0.92161,0.55914,0.93869,0.94778,0.8751,0.91556,0.70278,0.94891,0.48478,0.96933,0.0004465,0.0004465,0.0004465 -195,76025.3,0.91896,0.55666,0.93753,0.94826,0.87491,0.91554,0.70294,0.94845,0.48437,0.96904,0.000397,0.000397,0.000397 -196,76390.9,0.91657,0.55375,0.93573,0.94803,0.87506,0.91552,0.70318,0.94795,0.48442,0.96898,0.0003475,0.0003475,0.0003475 -197,76755.6,0.91365,0.54916,0.935,0.94771,0.87532,0.91542,0.70333,0.94716,0.48416,0.96863,0.000298,0.000298,0.000298 -198,77120,0.91124,0.54938,0.93358,0.94776,0.87553,0.91532,0.70364,0.9465,0.48394,0.96837,0.0002485,0.0002485,0.0002485 -199,77484.6,0.9098,0.54725,0.93255,0.94777,0.87521,0.9152,0.7037,0.94576,0.48354,0.96799,0.000199,0.000199,0.000199 -200,77848.7,0.9061,0.5449,0.93212,0.94734,0.8757,0.91516,0.70377,0.94538,0.48369,0.96777,0.0001495,0.0001495,0.0001495 diff --git a/rpi/training/result/unified-nano/results.png b/rpi/training/result/unified-nano/results.png deleted file mode 100644 index e8c55469..00000000 Binary files a/rpi/training/result/unified-nano/results.png and /dev/null differ diff --git a/rpi/training/result/unified-nano/train_batch0.jpg b/rpi/training/result/unified-nano/train_batch0.jpg deleted file mode 100644 index 107e91f2..00000000 Binary files a/rpi/training/result/unified-nano/train_batch0.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/train_batch1.jpg b/rpi/training/result/unified-nano/train_batch1.jpg deleted file mode 100644 index 4bc19c54..00000000 Binary files a/rpi/training/result/unified-nano/train_batch1.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/train_batch2.jpg b/rpi/training/result/unified-nano/train_batch2.jpg deleted file mode 100644 index 16a6f9d2..00000000 Binary files a/rpi/training/result/unified-nano/train_batch2.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/train_batch630990.jpg b/rpi/training/result/unified-nano/train_batch630990.jpg deleted file mode 100644 index 361349b8..00000000 Binary files a/rpi/training/result/unified-nano/train_batch630990.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/train_batch630991.jpg b/rpi/training/result/unified-nano/train_batch630991.jpg deleted file mode 100644 index 5e675072..00000000 Binary files a/rpi/training/result/unified-nano/train_batch630991.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/train_batch630992.jpg b/rpi/training/result/unified-nano/train_batch630992.jpg deleted file mode 100644 index 4a143bfc..00000000 Binary files a/rpi/training/result/unified-nano/train_batch630992.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/val_batch0_labels.jpg b/rpi/training/result/unified-nano/val_batch0_labels.jpg deleted file mode 100644 index d551557a..00000000 Binary files a/rpi/training/result/unified-nano/val_batch0_labels.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/val_batch0_pred.jpg b/rpi/training/result/unified-nano/val_batch0_pred.jpg deleted file mode 100644 index de269d30..00000000 Binary files a/rpi/training/result/unified-nano/val_batch0_pred.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/val_batch1_labels.jpg b/rpi/training/result/unified-nano/val_batch1_labels.jpg deleted file mode 100644 index 8be07a8a..00000000 Binary files a/rpi/training/result/unified-nano/val_batch1_labels.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/val_batch1_pred.jpg b/rpi/training/result/unified-nano/val_batch1_pred.jpg deleted file mode 100644 index 7d40ce64..00000000 Binary files a/rpi/training/result/unified-nano/val_batch1_pred.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/val_batch2_labels.jpg b/rpi/training/result/unified-nano/val_batch2_labels.jpg deleted file mode 100644 index 540a24a1..00000000 Binary files a/rpi/training/result/unified-nano/val_batch2_labels.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/val_batch2_pred.jpg b/rpi/training/result/unified-nano/val_batch2_pred.jpg deleted file mode 100644 index 72aafefa..00000000 Binary files a/rpi/training/result/unified-nano/val_batch2_pred.jpg and /dev/null differ diff --git a/rpi/training/result/unified-nano/weights/best.pt b/rpi/training/result/unified-nano/weights/best.pt deleted file mode 100644 index 05dda92c..00000000 Binary files a/rpi/training/result/unified-nano/weights/best.pt and /dev/null differ diff --git a/rpi/training/result/unified-nano/weights/last.pt b/rpi/training/result/unified-nano/weights/last.pt deleted file mode 100644 index 24217c3a..00000000 Binary files a/rpi/training/result/unified-nano/weights/last.pt and /dev/null differ diff --git a/rpi/training/result/unified-small/args.yaml b/rpi/training/result/unified-small/args.yaml deleted file mode 100644 index b230e8a8..00000000 --- a/rpi/training/result/unified-small/args.yaml +++ /dev/null @@ -1,106 +0,0 @@ -task: detect -mode: train -model: models/yolo11s.pt -data: ./datasets/pieces/unified/data.yaml -epochs: 150 -time: null -patience: 20 -batch: 12 -imgsz: 640 -save: true -save_period: 10 -cache: false -device: '0' -workers: 8 -project: result -name: unified-small -exist_ok: true -pretrained: true -optimizer: auto -verbose: true -seed: 0 -deterministic: true -single_cls: false -rect: false -cos_lr: false -close_mosaic: 10 -resume: false -amp: true -fraction: 1.0 -profile: false -freeze: null -multi_scale: false -compile: false -overlap_mask: true -mask_ratio: 4 -dropout: 0.0 -val: true -split: val -save_json: false -conf: null -iou: 0.7 -max_det: 300 -half: false -dnn: false -plots: true -source: null -vid_stride: 1 -stream_buffer: false -visualize: false -augment: true -agnostic_nms: false -classes: null -retina_masks: false -embed: null -show: false -save_frames: false -save_txt: false -save_conf: false -save_crop: false -show_labels: true -show_conf: true -show_boxes: true -line_width: null -format: torchscript -keras: false -optimize: false -int8: false -dynamic: false -simplify: true -opset: null -workspace: null -nms: false -lr0: 0.01 -lrf: 0.01 -momentum: 0.937 -weight_decay: 0.0005 -warmup_epochs: 3.0 -warmup_momentum: 0.8 -warmup_bias_lr: 0.1 -box: 7.5 -cls: 0.5 -dfl: 1.5 -pose: 12.0 -kobj: 1.0 -nbs: 64 -hsv_h: 0.015 -hsv_s: 0.7 -hsv_v: 0.4 -degrees: 10.0 -translate: 0.1 -scale: 0.1 -shear: 2.0 -perspective: 0.0 -flipud: 0.5 -fliplr: 0.5 -bgr: 0.0 -mosaic: 1.0 -mixup: 0.5 -cutmix: 0.0 -copy_paste: 0.0 -copy_paste_mode: flip -auto_augment: randaugment -erasing: 0.4 -cfg: null -tracker: botsort.yaml -save_dir: C:\Users\Laurent\Desktop\board-mate\rpi\training\result\unified-small diff --git a/rpi/training/result/unified-small/labels.jpg b/rpi/training/result/unified-small/labels.jpg deleted file mode 100644 index eb8ceca3..00000000 Binary files a/rpi/training/result/unified-small/labels.jpg and /dev/null differ diff --git a/rpi/training/result/unified-small/results.csv b/rpi/training/result/unified-small/results.csv deleted file mode 100644 index ae8d112d..00000000 --- a/rpi/training/result/unified-small/results.csv +++ /dev/null @@ -1,36 +0,0 @@ -epoch,time,train/box_loss,train/cls_loss,train/dfl_loss,metrics/precision(B),metrics/recall(B),metrics/mAP50(B),metrics/mAP50-95(B),val/box_loss,val/cls_loss,val/dfl_loss,lr/pg0,lr/pg1,lr/pg2 -1,469.68,1.4588,1.56499,1.26743,0.7138,0.73829,0.74489,0.46721,1.35429,1.03222,1.18238,0.00333203,0.00333203,0.00333203 -2,930.805,1.30938,1.03071,1.14974,0.81306,0.77515,0.8223,0.53213,1.29176,0.88476,1.13658,0.00662137,0.00662137,0.00662137 -3,1385.97,1.29451,0.98114,1.13067,0.80681,0.76005,0.79528,0.51047,1.32415,0.92207,1.13726,0.00986671,0.00986671,0.00986671 -4,1840.26,1.27626,0.94776,1.12616,0.84026,0.79785,0.84704,0.55468,1.29204,0.80333,1.1131,0.009802,0.009802,0.009802 -5,2297.42,1.23767,0.88241,1.11547,0.8632,0.81914,0.86715,0.58435,1.22597,0.74588,1.10086,0.009736,0.009736,0.009736 -6,2743.86,1.19804,0.82718,1.1022,0.87384,0.82354,0.87485,0.59487,1.21194,0.7117,1.09833,0.00967,0.00967,0.00967 -7,3191.47,1.17186,0.7881,1.09341,0.88492,0.83586,0.88091,0.60785,1.19203,0.67321,1.08615,0.009604,0.009604,0.009604 -8,3646.71,1.15818,0.76657,1.08976,0.89588,0.83731,0.88662,0.61578,1.16675,0.64156,1.08197,0.009538,0.009538,0.009538 -9,4095.04,1.14433,0.75176,1.08606,0.89159,0.84849,0.88986,0.62397,1.1532,0.62466,1.07152,0.009472,0.009472,0.009472 -10,4538.72,1.13229,0.73705,1.08097,0.90648,0.84697,0.89383,0.62912,1.14891,0.61086,1.07327,0.009406,0.009406,0.009406 -11,5015.76,1.12043,0.72166,1.07782,0.90611,0.85248,0.89618,0.63746,1.12122,0.60398,1.06267,0.00934,0.00934,0.00934 -12,5462.81,1.10717,0.70858,1.07164,0.91728,0.85037,0.89778,0.64081,1.11665,0.58918,1.06547,0.009274,0.009274,0.009274 -13,5909.61,1.10204,0.69402,1.06979,0.92239,0.85081,0.90075,0.64708,1.0994,0.58013,1.05117,0.009208,0.009208,0.009208 -14,6357.31,1.09757,0.69004,1.07018,0.92048,0.85302,0.90269,0.65066,1.0898,0.56696,1.04949,0.009142,0.009142,0.009142 -15,6805.4,1.08261,0.67813,1.06249,0.9216,0.8554,0.90299,0.65352,1.08556,0.56459,1.04844,0.009076,0.009076,0.009076 -16,7253.22,1.07969,0.67316,1.06249,0.93867,0.8532,0.90423,0.65793,1.07202,0.55066,1.04528,0.00901,0.00901,0.00901 -17,7706.49,1.07302,0.66449,1.06065,0.9331,0.85267,0.90549,0.66131,1.06352,0.55008,1.04059,0.008944,0.008944,0.008944 -18,8163.63,1.06878,0.65776,1.05646,0.94238,0.85321,0.90743,0.66427,1.05899,0.54161,1.03931,0.008878,0.008878,0.008878 -19,8617.65,1.06094,0.65266,1.05424,0.94308,0.85336,0.90918,0.66715,1.05338,0.53867,1.03518,0.008812,0.008812,0.008812 -20,9061.88,1.05899,0.64725,1.0533,0.94212,0.85584,0.90942,0.6693,1.04804,0.53296,1.0322,0.008746,0.008746,0.008746 -21,9543.8,1.05373,0.64631,1.05307,0.94717,0.8561,0.9104,0.67015,1.044,0.52713,1.02972,0.00868,0.00868,0.00868 -22,10025.7,1.04616,0.64231,1.04737,0.94793,0.85431,0.91076,0.67223,1.03728,0.52253,1.02813,0.008614,0.008614,0.008614 -23,10534.3,1.04453,0.63509,1.0464,0.94859,0.8569,0.91168,0.67283,1.0362,0.5199,1.02708,0.008548,0.008548,0.008548 -24,11013.9,1.0391,0.63,1.04558,0.9513,0.85641,0.91153,0.67441,1.03221,0.51731,1.02609,0.008482,0.008482,0.008482 -25,11561.8,1.03281,0.63061,1.04392,0.95266,0.85681,0.91163,0.67555,1.02975,0.51647,1.02502,0.008416,0.008416,0.008416 -26,12130,1.03067,0.62298,1.04136,0.95371,0.85685,0.91221,0.67638,1.02919,0.51482,1.02454,0.00835,0.00835,0.00835 -27,12758.5,1.02674,0.62246,1.0395,0.95377,0.85823,0.91264,0.67718,1.02754,0.5124,1.02333,0.008284,0.008284,0.008284 -28,13398.8,1.02412,0.62003,1.03772,0.95376,0.85867,0.9129,0.67802,1.02588,0.50997,1.02215,0.008218,0.008218,0.008218 -29,13867.7,1.01843,0.61479,1.03603,0.95459,0.85898,0.91306,0.67849,1.0247,0.50866,1.02127,0.008152,0.008152,0.008152 -30,14367.8,1.0158,0.60871,1.03531,0.95562,0.85835,0.9132,0.67911,1.02295,0.50646,1.02054,0.008086,0.008086,0.008086 -31,14837.8,1.01703,0.61018,1.0366,0.95504,0.85963,0.91351,0.67944,1.02291,0.50515,1.02042,0.00802,0.00802,0.00802 -32,15313.3,1.0105,0.60394,1.03358,0.95705,0.85842,0.91359,0.68019,1.02151,0.50401,1.01983,0.007954,0.007954,0.007954 -33,15778.3,1.00972,0.59947,1.03269,0.95611,0.85983,0.91378,0.68088,1.02043,0.50302,1.0194,0.007888,0.007888,0.007888 -34,16240.9,1.00426,0.59879,1.03068,0.95674,0.85982,0.91412,0.68173,1.01907,0.50182,1.01877,0.007822,0.007822,0.007822 -35,16717.7,1.00091,0.59585,1.02954,0.95583,0.86062,0.9143,0.68221,1.01817,0.50083,1.01836,0.007756,0.007756,0.007756 diff --git a/rpi/training/result/unified-small/train_batch0.jpg b/rpi/training/result/unified-small/train_batch0.jpg deleted file mode 100644 index 2da9c1a5..00000000 Binary files a/rpi/training/result/unified-small/train_batch0.jpg and /dev/null differ diff --git a/rpi/training/result/unified-small/train_batch1.jpg b/rpi/training/result/unified-small/train_batch1.jpg deleted file mode 100644 index 44f67c57..00000000 Binary files a/rpi/training/result/unified-small/train_batch1.jpg and /dev/null differ diff --git a/rpi/training/result/unified-small/train_batch2.jpg b/rpi/training/result/unified-small/train_batch2.jpg deleted file mode 100644 index 0992496c..00000000 Binary files a/rpi/training/result/unified-small/train_batch2.jpg and /dev/null differ diff --git a/rpi/training/result/unified-small/weights/best.pt b/rpi/training/result/unified-small/weights/best.pt deleted file mode 100644 index 7f0e6114..00000000 Binary files a/rpi/training/result/unified-small/weights/best.pt and /dev/null differ diff --git a/rpi/training/result/unified-small/weights/epoch0.pt b/rpi/training/result/unified-small/weights/epoch0.pt deleted file mode 100644 index 04c28ba7..00000000 Binary files a/rpi/training/result/unified-small/weights/epoch0.pt and /dev/null differ diff --git a/rpi/training/result/unified-small/weights/epoch10.pt b/rpi/training/result/unified-small/weights/epoch10.pt deleted file mode 100644 index 6f8c301b..00000000 Binary files a/rpi/training/result/unified-small/weights/epoch10.pt and /dev/null differ diff --git a/rpi/training/result/unified-small/weights/epoch20.pt b/rpi/training/result/unified-small/weights/epoch20.pt deleted file mode 100644 index 27597522..00000000 Binary files a/rpi/training/result/unified-small/weights/epoch20.pt and /dev/null differ diff --git a/rpi/training/result/unified-small/weights/epoch30.pt b/rpi/training/result/unified-small/weights/epoch30.pt deleted file mode 100644 index 16e820c4..00000000 Binary files a/rpi/training/result/unified-small/weights/epoch30.pt and /dev/null differ diff --git a/rpi/training/result/unified-small/weights/last.pt b/rpi/training/result/unified-small/weights/last.pt deleted file mode 100644 index 7f0e6114..00000000 Binary files a/rpi/training/result/unified-small/weights/last.pt and /dev/null differ diff --git a/rpi/training/training_v11_n.py b/rpi/training/training_v11_n.py deleted file mode 100644 index 6fca8a9a..00000000 --- a/rpi/training/training_v11_n.py +++ /dev/null @@ -1,19 +0,0 @@ -from ultralytics import YOLO - -def main(): - model = YOLO("models/yolo11n-seg.pt") - model.train( - data="./datasets/edges/data.yaml", - epochs=150, - patience=20, - imgsz=640, - batch=12, - save_period=10, - project="result", - name="edges-nano", - exist_ok=False, - device = 0 - ) - -if __name__ == "__main__": - main() \ No newline at end of file diff --git a/rpi/training/training_v11_s.py b/rpi/training/training_v11_s.py deleted file mode 100644 index 5a35459e..00000000 --- a/rpi/training/training_v11_s.py +++ /dev/null @@ -1,31 +0,0 @@ -from ultralytics import YOLO - -def main(): - model = YOLO("models/yolo11s.pt") - model.train( - data="./datasets/pieces/unified/data.yaml", - epochs=150, - patience=20, - imgsz=640, - batch=12, - save_period=10, - project="result", - name="unified-small", - exist_ok=True, - device=0, - augment=True, - flipud=0.5, # vertical flip with 50% probability - fliplr=0.5, # horizontal flip with 50% probability - hsv_h=0.015, # change hue - hsv_s=0.7, # change saturation - hsv_v=0.4, # change brightness/value - degrees=10.0, # random rotation ±10 degrees - translate=0.1, # translation ±10% - scale=0.1, # scaling ±10% - shear=2.0, # shear ±2 degrees - mosaic=1.0, # mosaic augmentation - mixup=0.5 # mixup augmentation - ) - -if __name__ == "__main__": - main() \ No newline at end of file diff --git a/rpi/training/utils/__init__.py b/rpi/training/utils/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/rpi/training/utils/debug.py b/rpi/training/utils/debug.py deleted file mode 100644 index 3ad981d8..00000000 --- a/rpi/training/utils/debug.py +++ /dev/null @@ -1,26 +0,0 @@ -from pathlib import Path - -label_dir = Path("./datasets/your_dataset/val/labels") - -def valid_line(line): - parts = line.split() - if len(parts) != 5: - return False - cls, x, y, w, h = map(float, parts) - return 0 <= cls and 0 < w <= 1 and 0 < h <= 1 - - -empty = [] -for p in label_dir.glob("*.txt"): - if p.stat().st_size == 0: - empty.append(p.name) - -print(f"Empty label files: {len(empty)}") - -invalid = [] -for p in label_dir.glob("*.txt"): - lines = p.read_text().strip().splitlines() - if not any(valid_line(l) for l in lines): - invalid.append(p.name) - -print(f"Effectively empty labels: {len(invalid)}") \ No newline at end of file diff --git a/rpi/training/utils/decrease_labels.py b/rpi/training/utils/decrease_labels.py deleted file mode 100644 index 05368e06..00000000 --- a/rpi/training/utils/decrease_labels.py +++ /dev/null @@ -1,30 +0,0 @@ -import os - -labels_dir = "C:/Users/Laurent/Desktop/board-mate/rpi/training/datasets/edges/chess board detection 2.v2i.yolov11" - -for filename in os.listdir(labels_dir): - if not filename.endswith(".txt"): - continue - - txt_path = os.path.join(labels_dir, filename) - new_lines = [] - - with open(txt_path, "r") as f: - lines = f.readlines() - - for line in lines: - parts = line.strip().split() - if len(parts) < 5: - continue # skip invalid lines - cls = int(parts[0]) - cls -= 1 # subtract 1 from class index - cls = max(cls, 0) # ensure no negative indices - new_lines.append(" ".join([str(cls)] + parts[1:])) - - # Overwrite file with updated indices - with open(txt_path, "w") as f: - f.write("\n".join(new_lines)) - - print(f"Updated {filename}") - -print("All label files have been adjusted!") \ No newline at end of file diff --git a/rpi/training/utils/remove_labels.py b/rpi/training/utils/remove_labels.py deleted file mode 100644 index babb78c1..00000000 --- a/rpi/training/utils/remove_labels.py +++ /dev/null @@ -1,33 +0,0 @@ -import os - -labels_dir = "C:/Users/Laurent/Desktop/board-mate/rpi/training/datasets/edges/misis2025_cv_chess.v1i.yolov11/valid/labels" - -labels_to_be_removed = [0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - -for filename in os.listdir(labels_dir): - if not filename.endswith(".txt"): - continue - - txt_path = os.path.join(labels_dir, filename) - new_lines = [] - - with open(txt_path, "r") as f: - lines = f.readlines() - - for line in lines: - parts = line.strip().split() - - if len(parts) < 5: - continue - - cls = int(parts[0]) - if cls in labels_to_be_removed: - print(f"{parts} found in {filename}") - continue - cls = 0 - new_lines.append(" ".join([str(cls)] + parts[1:])) - - with open(txt_path, "w") as f: - f.write("\n".join(new_lines)) - -print("All label files have been adjusted!") \ No newline at end of file diff --git a/rpi/training/utils/remover.py b/rpi/training/utils/remover.py deleted file mode 100644 index 55ebe32b..00000000 --- a/rpi/training/utils/remover.py +++ /dev/null @@ -1,16 +0,0 @@ -import os - -# Paths to the folders -folder_to_check = "./datasets/roboflow/train/labels" -folder_with_files = "./datasets/unified/train/labels" - -files_to_check = set(os.listdir(folder_to_check)) - -for filename in os.listdir(folder_with_files): - file_path = os.path.join(folder_with_files, filename) - if filename in files_to_check and os.path.isfile(file_path): - try: - os.remove(file_path) - print(f"Deleted: {file_path}") - except Exception as e: - print(f"Error deleting {file_path}: {e}") \ No newline at end of file diff --git a/rpi/training/utils/sort_labels.py b/rpi/training/utils/sort_labels.py deleted file mode 100644 index 87e19342..00000000 --- a/rpi/training/utils/sort_labels.py +++ /dev/null @@ -1,69 +0,0 @@ -import os -import shutil - - -def copy_files(src, dest): - - for filename in os.listdir(src): - src_path = os.path.join(src, filename) - dst_path = os.path.join(dest, filename) - shutil.copy2(src_path, dst_path) - -def remap_labels(src, dest): - count = 0 - for filename in os.listdir(src): - if filename.endswith(".txt"): - input_path = os.path.join(src, filename) - output_path = os.path.join(dest, filename) - - with open(input_path, "r") as f: - lines = f.readlines() - - new_lines = [] - for line in lines: - parts = line.strip().split() - old_idx = int(parts[0]) - new_idx = index_map[old_idx] - new_lines.append(" ".join([str(new_idx)] + parts[1:])) - - with open(output_path, "w") as f: - f.write("\n".join(new_lines)) - - if count%100 == 0: - print(count) - count += 1 - - print(f"All labels remapped and saved to '{dest}'") - - -if __name__ == "__main__": - - src_dir = "../datasets/edges/misis2025_cv_chess.v1i.yolov11/" - dest_dir = "../datasets/edges/" - - reference_classes = [ - 'w_pawn', 'w_knight', 'w_bishop', 'w_rook', 'w_queen', 'w_king', - 'b_pawn', 'b_knight', 'b_bishop', 'b_rook', 'b_queen', 'b_king' - ] - - current_classes = ['b_bishop', 'b_king', 'b_knight', 'b_pawn', 'b_queen', 'b_rook', - 'w_bishop', 'w_king', 'w_knight', 'w_pawn', 'w_queen', 'w_rook'] - - index_map = {current_classes.index(cls): reference_classes.index(cls) for cls in current_classes} - - sub_elements = os.listdir(src_dir) - for sub in sub_elements: - src_full_path = os.path.normpath(os.path.join(src_dir, sub)) - dest_full_path = os.path.normpath(os.path.join(dest_dir, sub)) - - if not os.path.isdir(src_full_path): continue - - src_image_folder = os.path.normpath(os.path.join(src_full_path, "images")) - src_labels_folder = os.path.normpath(os.path.join(src_full_path, "labels")) - - dst_image_folder = os.path.normpath(os.path.join(dest_full_path, "images")) - dst_labels_folder = os.path.normpath(os.path.join(dest_full_path, "labels")) - - copy_files(src_image_folder, dst_image_folder) - copy_files(src_labels_folder, dst_labels_folder) - #remap_labels(src_labels_folder, dst_labels_folder) diff --git a/rpi/training/utils/verifiy.py b/rpi/training/utils/verifiy.py deleted file mode 100644 index 80a1c1fa..00000000 --- a/rpi/training/utils/verifiy.py +++ /dev/null @@ -1,47 +0,0 @@ -import os - -if __name__ == "__main__": - trg_dir = "../datasets/pieces/unified/train/labels" - src_dir = "../datasets/pieces/khalid/train/labels" - - trg_labels = [ - 'w_pawn','w_knight','w_bishop','w_rook','w_queen','w_king', - 'b_pawn','b_knight','b_bishop','b_rook','b_queen','b_king' - ] - - src_labels = [ - 'b_bishop', 'b_king', 'b_knight', 'b_queen', 'b_rook', 'b_pawn', - 'w_bishop', 'w_king', 'w_knight', 'w_queen', 'w_rook', 'w_pawn' - ] - - trg_files = os.listdir(trg_dir) - src_files = os.listdir(src_dir) - - for src_file in src_files: - trg_file = os.path.abspath(os.path.join(trg_dir, src_file)) - src_file = os.path.abspath(os.path.join(src_dir, src_file)) - - trg_lines = [] - src_lines = [] - - with open(src_file, "r") as f: - src_lines = f.readlines().copy() - - with open(trg_file, "r") as f: - trg_lines = f.readlines().copy() - - for i in range(0, len(trg_lines)): - trg_line = trg_lines[i] - src_line = src_lines[i] - - trg_label_index = int(trg_line.strip().split(" ")[0]) - src_label_index = int(src_line.strip().split(" ")[0]) - - trg_label_value = trg_labels[trg_label_index] - src_label_value = src_labels[src_label_index] - - if trg_label_value != src_label_value : - print(f"Error detected in {trg_file} at line {i}.\n" - f"==> Index {trg_label_index} points to {trg_label_value} instead of {src_label_index}:{src_label_value}") - -print("Detection terminated.") \ No newline at end of file diff --git a/rpi/training/yolo11n.pt b/rpi/training/yolo11n.pt deleted file mode 100644 index 45b273b4..00000000 Binary files a/rpi/training/yolo11n.pt and /dev/null differ