Skip to content

Commit

Permalink
fix: NDArray[np.float64] typing
Browse files Browse the repository at this point in the history
  • Loading branch information
engnadeau committed Aug 23, 2022
1 parent 5844673 commit d82143c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions pybotics/optimization.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import attr
import numpy as np # type: ignore
import numpy.typing as npt

from pybotics.robot import Robot
from pybotics.errors import PyboticsError
Expand Down Expand Up @@ -78,7 +79,7 @@ def apply_optimization_vector(self, vector: np.ndarray) -> None:
world_vector[self.world_mask] = world_segment
self.robot.world_frame = vector_2_matrix(world_vector)

def generate_optimization_vector(self) -> np.ndarray:
def generate_optimization_vector(self) -> npt.NDArray[np.float64]:
"""Generate vector."""
kc_vector = np.compress(
self.kinematic_chain_mask, self.robot.kinematic_chain.vector
Expand All @@ -95,7 +96,7 @@ def optimize_accuracy(
handler: OptimizationHandler,
qs: Sequence[Sequence[float]],
positions: Sequence[Sequence[float]],
) -> np.ndarray:
) -> npt.NDArray[np.float64]:
"""Fitness function for accuracy optimization."""
handler.apply_optimization_vector(optimization_vector)
errors = compute_absolute_errors(qs=qs, positions=positions, robot=handler.robot)
Expand All @@ -112,7 +113,7 @@ def compute_absolute_error(q: np.ndarray, position: np.ndarray, robot: Robot) ->

def compute_absolute_errors(
qs: np.ndarray, positions: np.ndarray, robot: Robot
) -> np.ndarray:
) -> npt.NDArray[np.float64]:
"""
Compute the absolute errors of a given set of positions.
Expand Down Expand Up @@ -143,6 +144,6 @@ def compute_relative_error(

def compute_relative_errors(
qs_a: np.ndarray, qs_b: np.ndarray, distances: np.ndarray, robot: Robot
) -> np.array:
) -> npt.NDArray[np.float64]:
"""Compute the relative errors of a given set of position combinations."""
return list(map(compute_relative_error, qs_a, qs_b, distances, repeat(robot)))

0 comments on commit d82143c

Please sign in to comment.