60 task write trails drawing feature functions total distance updated

src/graphomotor/core/models.py

@@ -9,6 +9,8 @@
 import pydantic
 import scipy.spatial.distance as dist
 
+from graphomotor.core import config
+
 
 class Drawing(pydantic.BaseModel):
     """Class representing a drawing task, encapsulating both raw data and metadata.
@@ -248,12 +250,6 @@ def valid_ink_trajectory(
             ):
                 ink_end_idx = idx
                 break
-        if (
-            ink_start_idx is not None
-            and ink_end_idx is not None
-            and ink_end_idx > ink_start_idx
-        ):
-            self.ink_points = self.points.iloc[ink_start_idx : ink_end_idx + 1].copy()
 
         return ink_start_idx, ink_end_idx
 
@@ -352,3 +348,140 @@ def detect_hesitations(self, threshold_percentile: int = 20) -> None:
         self.hesitation_duration = np.sum(hesitations) * dt[0]
 
         return
+
+    def calculate_smoothness(self) -> None:
+        """Calculate path smoothness based on Root Mean Square (RMS) curvature.
+
+        Represents the curvature per unit arc length.
+        Lower values indicate smoother drawings. Penalizes sharp corners (e.g.,
+        90° turns) and noisy corrections. Normalized by arc length to reduce
+        sampling-rate dependence.
+        """
+        if len(self.ink_points) < 3:
+            return
+
+        xy = self.ink_points[["x", "y"]].to_numpy()
+
+        forward_vector = xy[1:-1] - xy[:-2]
+        backward_vector = xy[2:] - xy[1:-1]
+
+        forward_norm = np.linalg.norm(forward_vector, axis=1)
+        backward_norm = np.linalg.norm(backward_vector, axis=1)
+
+        valid = (forward_norm > 0) & (backward_norm > 0)
+        if not np.any(valid):
+            return
+
+        valid_forward_vector = forward_vector[valid]
+        valid_backward_vector = backward_vector[valid]
+        valid_forward_norm = forward_norm[valid]
+        valid_backward_norm = backward_norm[valid]
+
+        cos_angle = (valid_forward_vector * valid_backward_vector).sum(axis=1) / (
+            valid_forward_norm * valid_backward_norm
+        )
+        cos_angle = np.clip(cos_angle, -1.0, 1.0)
+
+        angles = np.arccos(cos_angle)
+
+        avg_segment_length = (valid_forward_norm + valid_backward_norm) / 2.0
+        curvatures = angles / avg_segment_length
+
+        self.smoothness = float(np.sqrt(np.mean(curvatures**2)))
+
+        return
+
+    def compute_segment_metrics(
+        self, circles: dict[str, dict[str, CircleTarget]], trail_id: str
+    ) -> None:
+        """Compute all metrics for a line segment.
+
+        This function computes various metrics for the line segment, including ink time,
+        velocity metrics, path optimality, smoothness, and hesitation detection. It
+        first determines the valid ink trajectory between the start and end circles. If
+        a valid trajectory is found, it updates the ink_points attribute and calculates
+        the metrics.
+
+        Args:
+            circles: A dictionary mapping each trail type to dictionaries of
+                CircleTarget instances (output of load_scaled_circles in config).
+            trail_id: Trail identifier for circle lookup.
+        """
+        logger = config.get_logger()
+        trail_circles = circles[trail_id]
+        points = self.points.copy()
+
+        if len(points) < 2:
+            logger.warning(
+                "Not enough points to calculate metrics for line segment: "
+                "start=%s end=%s",
+                self.start_label,
+                self.end_label,
+            )
+            return
+
+        if self.start_label not in trail_circles or self.end_label not in trail_circles:
+            logger.warning(
+                "Missing start/end labels: start=%s end=%s available=%s",
+                self.start_label,
+                self.end_label,
+                list(trail_circles.keys()),
+            )
+            return
+
+        start_circle = trail_circles[self.start_label]
+        end_circle = trail_circles[self.end_label]
+
+        ink_start_idx, ink_end_idx = self.valid_ink_trajectory(start_circle, end_circle)
+
+        if ink_start_idx is None:
+            logger.warning(
+                "No valid ink trajectory found for line segment: start=%s end=%s",
+                self.start_label,
+                self.end_label,
+            )
+            return
+        if ink_end_idx is None:
+            self.ink_points = points.iloc[ink_start_idx:].copy()
+            if len(self.ink_points) < 2:
+                logger.warning(
+                    "Not enough ink points to calculate metrics for line segment: "
+                    "start=%s end=%s",
+                    self.start_label,
+                    self.end_label,
+                )
+                return
+            self.ink_time = (
+                self.ink_points.iloc[-1]["seconds"] - self.ink_points.iloc[0]["seconds"]
+            )
+            return
+        if ink_end_idx <= ink_start_idx:
+            logger.warning(
+                "Invalid ink trajectory: end index (%d) is not greater than "
+                "start index (%d) for line segment: start=%s end=%s",
+                ink_end_idx,
+                ink_start_idx,
+                self.start_label,
+                self.end_label,
+            )
+            return
+        self.ink_points = self.points.iloc[ink_start_idx : ink_end_idx + 1].copy()
+
+        if len(self.ink_points) < 2:
+            logger.warning(
+                "Not enough ink points to calculate metrics for line segment: "
+                "start=%s end=%s",
+                self.start_label,
+                self.end_label,
+            )
+            return
+
+        self.ink_time = (
+            self.ink_points.iloc[-1]["seconds"] - self.ink_points.iloc[0]["seconds"]
+        )
+        self.calculate_velocity_metrics()
+        self.calculate_path_optimality(start_circle, end_circle)
+        self.calculate_smoothness()
+        self.detect_hesitations()
+
+        return

src/graphomotor/features/trails/drawing_metrics.py

@@ -1,8 +1,5 @@
 """Feature extraction module for drawing error-based metrics in trails drawing data."""
 
-import numpy as np
-import pandas as pd
-
 from graphomotor.core import models
 
 
@@ -43,49 +40,3 @@ def percent_accurate_paths(drawing: models.Drawing) -> dict[str, float]:
             (drawing.data["correct_path"] == drawing.data["actual_path"]).mean() * 100
         )
     }
-
-
-def calculate_smoothness(points: pd.DataFrame) -> float:
-    """Calculate path smoothness based on Root Mean Square (RMS) curvature.
-
-    Represents the curvature per unit arc length.
-    Lower values indicate smoother drawings. Penalizes sharp corners (e.g., 90° turns)
-    and noisy corrections. Normalized by arc length to reduce sampling-rate dependence.
-
-    Args:
-        points: DataFrame representing drawing points.
-
-    Returns:
-        Smoothness metric as a float.
-    """
-    if len(points) < 3:
-        return 0.0
-
-    xy = points[["x", "y"]].to_numpy()
-
-    forward_vector = xy[1:-1] - xy[:-2]
-    backward_vector = xy[2:] - xy[1:-1]
-
-    forward_norm = np.linalg.norm(forward_vector, axis=1)
-    backward_norm = np.linalg.norm(backward_vector, axis=1)
-
-    valid = (forward_norm > 0) & (backward_norm > 0)
-    if not np.any(valid):
-        return 0.0
-
-    valid_forward_vector = forward_vector[valid]
-    valid_backward_vector = backward_vector[valid]
-    valid_forward_norm = forward_norm[valid]
-    valid_backward_norm = backward_norm[valid]
-
-    cos_angle = (valid_forward_vector * valid_backward_vector).sum(axis=1) / (
-        valid_forward_norm * valid_backward_norm
-    )
-    cos_angle = np.clip(cos_angle, -1.0, 1.0)
-
-    angles = np.arccos(cos_angle)
-
-    avg_segment_length = (valid_forward_norm + valid_backward_norm) / 2.0
-    curvatures = angles / avg_segment_length
-
-    return float(np.sqrt(np.mean(curvatures**2)))