Ver (#18)

* coverage

* pass model id

* remove mysql config

* add noise

* fix tests

* fix tests

.github/workflows/ci.yml

@@ -73,7 +73,7 @@ jobs:
           poetry run ruff --format=github --target-version=py37 .
 
       - name: Run the automated tests
-        run: poetry run pytest -v
+        run: poetry run pytest -v --cov=cnceye tests
 
   blender:
     name: Blender

cnceye/edge/find.py

@@ -3,8 +3,6 @@
 import mysql.connector
 from mysql.connector.errors import IntegrityError
 
-from cnceye.config import MYSQL_CONFIG
-
 
 def find_edge(filepath: str, minimal_diff: float = 5.0):
     # read csv
@@ -22,9 +20,7 @@ def find_edge(filepath: str, minimal_diff: float = 5.0):
         previous_distance = distance
 
 
-def find_edges(
-    process_id: int, mysql_config: dict = MYSQL_CONFIG, minimal_diff: float = 5.0
-):
+def find_edges(process_id: int, mysql_config: dict, minimal_diff: float = 5.0):
     cnx = mysql.connector.connect(**mysql_config, database="coord")
     cursor = cnx.cursor()
     query = "SELECT * FROM sensor WHERE process_id = %s"
@@ -105,11 +101,11 @@ def find_lines(filepath: str, edge_count: int, minimal_diff: float = 5.0):
     return lines
 
 
-def get_edge_data(mysql_config=MYSQL_CONFIG):
+def get_edge_data(model_id: int, mysql_config):
     cnx = mysql.connector.connect(**mysql_config, database="coord")
     cursor = cnx.cursor()
-    query = "SELECT id,x,y,z FROM edge"
-    cursor.execute(query)
+    query = "SELECT id,x,y,z FROM edge WHERE model_id = %s"
+    cursor.execute(query, (model_id,))
     edges = cursor.fetchall()
     cursor.close()
     cnx.close()
@@ -135,7 +131,7 @@ def identify_close_edge(edges, measured_edges, distance_threshold=2.5):
     return update_list
 
 
-def add_measured_edge_coord(edge_list: list, mysql_config=MYSQL_CONFIG):
+def add_measured_edge_coord(edge_list: list, mysql_config: dict):
     cnx = mysql.connector.connect(**mysql_config, database="coord")
     cursor = cnx.cursor()
     query = "UPDATE edge SET rx = %s, ry = %s, rz = %s WHERE id = %s"
@@ -148,12 +144,14 @@ def add_measured_edge_coord(edge_list: list, mysql_config=MYSQL_CONFIG):
     cnx.close()
 
 
-def process_edges(mysql_config: dict, minimal_diff: float = 5.0) -> int:
+def process_edges(
+    model_id: int, process_id: int, mysql_config: dict, minimal_diff: float = 5.0
+) -> int:
     """
     Identify the edges from the sensor data and add the coordinates to the database
     """
-    measured_edges = find_edges(mysql_config, minimal_diff)
-    edge_data = get_edge_data(mysql_config)
+    measured_edges = find_edges(process_id, mysql_config, minimal_diff)
+    edge_data = get_edge_data(model_id, mysql_config)
     update_list = identify_close_edge(edge_data, measured_edges)
     add_measured_edge_coord(update_list, mysql_config)
     edge_count = len(edge_data)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cnceye"
-version = "0.4.2"
+version = "0.4.3"
 description = "CMM python library"
 license = "MIT"
 authors = ["yuichiroaoki <45054071+yuichiroaoki@users.noreply.github.com>"]
@@ -11,13 +11,13 @@ keywords = ["cnc", "cmm", "milling", "gcode"]
 [tool.poetry.dependencies]
 python = ">=3.11,<3.13"
 mysql-connector-python = "^8.1.0"
-scipy = "^1.11.1"
 
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.0.280"
 pytest = "^7.4.0"
 black = "^23.7.0"
+pytest-cov = "^4.1.0"
 
 [build-system]
 requires = ["poetry-core"]

scripts/simple_measurement.py

@@ -6,6 +6,7 @@
 import sqlite3
 import csv
 import sys
+import random
 
 # Get the active object (the 3D model)
 obj = bpy.data.objects["test-part"]
@@ -14,14 +15,18 @@
 
 # x, y, z, distance
 data = []
+current_data = 100000
+threshold = 100
 
 # Ensure the object has a mesh
 assert obj.type == "MESH"
 
 
 def distance_to_analog_output(distance: float):
     distance = distance * 1000 * 135  # m to mm, distance to analog output
-    return float(round(distance))
+    # add noise
+    distance = distance + (distance * 0.001 * (2 * random.random() - 1))
+    return round(distance)
 
 
 def load_gcode(filepath: str):
@@ -40,6 +45,7 @@ def move_start_point(_start_point, xyz, feedrate: float):
     feedrate: float (mm/min)
     sensor response time is 10ms
     """
+    global current_data
     one_step_distance = feedrate / 1000 / 60 * 0.01  # m/step
     destination = Vector(tuple([x / 1000 for x in xyz]))
     total_distance_to_move = (destination - _start_point).length
@@ -57,7 +63,10 @@ def move_start_point(_start_point, xyz, feedrate: float):
         xyz = [_start_point.x, _start_point.y, _start_point.z]
         xyz = [round(x * 1000, 3) for x in xyz]
 
-        data.append([*xyz, distance_to_analog_output(distance)])
+        _sensor_data = distance_to_analog_output(distance)
+        if abs(_sensor_data - current_data) > threshold:
+            data.append([*xyz, _sensor_data])
+            current_data = _sensor_data
         _start_point = _start_point + move_vector
 
     return destination  # _start_point not may not become exactly the destination

tests/test_find.py

@@ -1,4 +1,4 @@
-from cnceye.config import MYSQL_CONFIG
+from tests.config import MYSQL_CONFIG
 from cnceye.edge import find
 import mysql.connector
 import sqlite3
@@ -31,7 +31,7 @@ def copy_sqlite_db_to_mysql():
 
 def test_find_edges():
     copy_sqlite_db_to_mysql()
-    measured_edges = find.find_edges(process_id)
+    measured_edges = find.find_edges(process_id, MYSQL_CONFIG)
     assert len(measured_edges) > 32
 
 
@@ -49,7 +49,7 @@ def test_find_edge_from_sqlite():
 
 
 def test_add_measured_edge_coord():
-    measured_edges = find.find_edges(process_id)
+    measured_edges = find.find_edges(process_id, MYSQL_CONFIG)
     edge_data = [
         (1, -50.0, -21.667, 10.0),
         (2, -50.0, 21.667, 10.0),
@@ -83,9 +83,9 @@ def test_add_measured_edge_coord():
         (30, -4.5, -22.203, 10.0),
         (31, -4.5, -37.791, 10.0),
     ]
-    # edge_data = find.get_edge_data()
+    # edge_data = find.get_edge_data(1)
     update_list = find.identify_close_edge(edge_data, measured_edges)
-    find.add_measured_edge_coord(update_list)
+    find.add_measured_edge_coord(update_list, MYSQL_CONFIG)
 
 
 def test_check_if_edge_is_found():

tests/test_script_utils.py

@@ -0,0 +1,18 @@
+import random
+
+
+def distance_to_analog_output(distance: float):
+    """
+    distance: float in m
+    """
+    distance = distance * 1000 * 135  # m to mm, distance to analog output
+    # add noise
+    distance = distance + (distance * 0.001 * (2 * random.random() - 1))
+    return round(distance)
+
+
+def test_distance_to_analog_output():
+    distance_in_mm = 10.5
+    analog_output = distance_to_analog_output(distance_in_mm / 1000)
+    assert analog_output > 0
+    assert analog_output < 19000