From 467060dfa3b9ee1e6b0cf05af1108af60f669547 Mon Sep 17 00:00:00 2001 From: Pariterre Date: Mon, 9 Nov 2020 16:57:22 -0500 Subject: [PATCH 1/2] Changed some casadi calls --- bioviz/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bioviz/__init__.py b/bioviz/__init__.py index 491f4f8..7d5d860 100644 --- a/bioviz/__init__.py +++ b/bioviz/__init__.py @@ -89,7 +89,7 @@ def __init__(self, model): def _prepare_function_for_casadi(self): q_sym = casadi.MX.sym("Q", self.m.nbQ(), 1) - self.markers = casadi.Function("Markers", [q_sym], [self.m.markers(q_sym)]).expand() + self.markers = biorbd.to_casadi_func("Markers", self.m.markers, q_sym) def _get_data_from_eigen(self, Q=None, compute_kin=True): if compute_kin: @@ -109,7 +109,7 @@ def __init__(self, model): def _prepare_function_for_casadi(self): Qsym = casadi.MX.sym("Q", self.m.nbQ(), 1) - self.CoM = casadi.Function("CoM", [Qsym], [self.m.CoM(Qsym).to_mx()]).expand() + self.CoM = biorbd.to_casadi_func("CoM", self.m.CoM, Qsym) def _get_data_from_eigen(self, Q=None, compute_kin=True): if compute_kin: @@ -129,7 +129,7 @@ def __init__(self, model): def _prepare_function_for_casadi(self): Qsym = casadi.MX.sym("Q", self.m.nbQ(), 1) - self.CoMs = casadi.Function("CoMbySegment", [Qsym], [self.m.CoMbySegmentInMatrix(Qsym).to_mx()]).expand() + self.CoMs = biorbd.to_casadi_func("CoMbySegment", self.m.CoMbySegmentInMatrix, Qsym) def _get_data_from_eigen(self, Q=None, compute_kin=True): self.data = [] From 8be48daae7f6aa0a9eab285269dfdfaf53875d07 Mon Sep 17 00:00:00 2001 From: Pariterre Date: Mon, 9 Nov 2020 17:11:51 -0500 Subject: [PATCH 2/2] Forced biorbd 1.4.0 --- bioviz/__init__.py | 2 +- bioviz/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bioviz/__init__.py b/bioviz/__init__.py index 7d5d860..33c5ff0 100644 --- a/bioviz/__init__.py +++ b/bioviz/__init__.py @@ -47,7 +47,7 @@ def check_version(tool_to_compare, min_version, max_version): raise ImportError(f"{name} should be lesser than version {max_version}") -check_version(biorbd, "1.3.1", "2.0.0") +check_version(biorbd, "1.4.0", "2.0.0") check_version(pyomeca, "2020.0.1", "2020.1.0") from pyomeca import Markers diff --git a/bioviz/_version.py b/bioviz/_version.py index 8c0d5d5..159d48b 100644 --- a/bioviz/_version.py +++ b/bioviz/_version.py @@ -1 +1 @@ -__version__ = "2.0.0" +__version__ = "2.0.1"