imt-ring 1.6.26__tar.gz → 1.6.28__tar.gz

{imt_ring-1.6.26 → imt_ring-1.6.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imt-ring
-Version: 1.6.26
+Version: 1.6.28
 Summary: RING: Recurrent Inertial Graph-based Estimator
 Author-email: Simon Bachhuber <simon.bachhuber@fau.de>
 Project-URL: Homepage, https://github.com/SimiPixel/ring
@@ -38,6 +38,10 @@ Requires-Dist: nbmake; extra == "dev"
 # Recurrent Inertial Graph-based Estimator (RING)
 <img src="https://raw.githubusercontent.com/simon-bachhuber/ring/main/docs/img/coverage_badge.svg" height="20" />
 
+> **ℹ️ Tip:**
+> 
+> Check out my new plug-and-play interface for inertial motion tracking (RING included) [here](https://github.com/simon-bachhuber/imt.git).
+
 ## Installation
 
 Supports `Python=3.10/3.11/3.12` (tested).

{imt_ring-1.6.26 → imt_ring-1.6.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "imt-ring"
-version = "1.6.26"
+version = "1.6.28"
 authors = [
   { name="Simon Bachhuber", email="simon.bachhuber@fau.de" },
 ]

{imt_ring-1.6.26 → imt_ring-1.6.28}/readme.md

@@ -5,6 +5,10 @@
 # Recurrent Inertial Graph-based Estimator (RING)
 <img src="https://raw.githubusercontent.com/simon-bachhuber/ring/main/docs/img/coverage_badge.svg" height="20" />
 
+> **ℹ️ Tip:**
+> 
+> Check out my new plug-and-play interface for inertial motion tracking (RING included) [here](https://github.com/simon-bachhuber/imt.git).
+
 ## Installation
 
 Supports `Python=3.10/3.11/3.12` (tested).

{imt_ring-1.6.26 → imt_ring-1.6.28}/src/imt_ring.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imt-ring
-Version: 1.6.26
+Version: 1.6.28
 Summary: RING: Recurrent Inertial Graph-based Estimator
 Author-email: Simon Bachhuber <simon.bachhuber@fau.de>
 Project-URL: Homepage, https://github.com/SimiPixel/ring
@@ -38,6 +38,10 @@ Requires-Dist: nbmake; extra == "dev"
 # Recurrent Inertial Graph-based Estimator (RING)
 <img src="https://raw.githubusercontent.com/simon-bachhuber/ring/main/docs/img/coverage_badge.svg" height="20" />
 
+> **ℹ️ Tip:**
+> 
+> Check out my new plug-and-play interface for inertial motion tracking (RING included) [here](https://github.com/simon-bachhuber/imt.git).
+
 ## Installation
 
 Supports `Python=3.10/3.11/3.12` (tested).

{imt_ring-1.6.26 → imt_ring-1.6.28}/src/ring/__init__.py

@@ -98,7 +98,10 @@ def RING(lam: list[int] | None, Ts: float | None, **kwargs) -> ml.AbstractFilter
         add_Ts = True
 
     ringnet = ml.RING(
-        params=params, lam=None if lam is None else tuple(lam), jit=False, name="RING"
+        params=params,
+        lam=None if lam is None else tuple(lam),
+        jit=config.pop("jit", False),
+        name="RING",
     )
     ringnet = ml.base.ScaleX_FilterWrapper(ringnet)
     if config["use_lpf"]:

{imt_ring-1.6.26 → imt_ring-1.6.28}/src/ring/algorithms/generator/base.py

@@ -55,6 +55,11 @@ class RCMG:
     ) -> None:
         "Random Chain Motion Generator"
 
+        # add some default values
+        randomize_hz_kwargs_defaults = dict(add_dt=True)
+        randomize_hz_kwargs_defaults.update(randomize_hz_kwargs)
+        randomize_hz_kwargs = randomize_hz_kwargs_defaults
+
         sys, config = utils.to_list(sys), utils.to_list(config)
         sys_ml = sys[0] if sys_ml is None else sys_ml
 
@@ -409,7 +414,11 @@ def _build_mconfig_batched_generator(
         @jax.vmap
         def _vmapped_context(key, q, sys):
             x, _ = jax.vmap(kinematics.forward_kinematics_transforms, (None, 0))(sys, q)
-            X = {"dt": jnp.array(sys.dt)} if randomize_hz else {}
+            X = (
+                {"dt": jnp.array(sys.dt)}
+                if (randomize_hz and randomize_hz_kwargs["add_dt"])
+                else {}
+            )
             Xy, extras = (X, {}), (key, q, x, sys)
             return _finalize_fn(Xy, extras)
 

{imt_ring-1.6.26 → imt_ring-1.6.28}/src/ring/io/xml/from_xml.py

@@ -2,6 +2,7 @@ from xml.etree import ElementTree
 
 import jax
 import numpy as np
+
 from ring import base
 from ring.algorithms import jcalc
 from ring.utils import parse_path
@@ -181,7 +182,10 @@ def load_sys_from_str(xml_str: str, seed: int = 1) -> base.System:
 
         link_parents[current_link_idx] = parent
         link_types[current_link_idx] = current_link_typ
-        link_names[current_link_idx] = body.attrib["name"]
+        current_name = body.attrib["name"]
+        link_names[current_link_idx] = (
+            current_name if isinstance(current_name, str) else str(int(current_name))
+        )
 
         transform = abstract.AbsTrans.from_xml(body.attrib)
         pos_min, pos_max = abstract.AbsPosMinMax.from_xml(body.attrib, transform.pos)

{imt_ring-1.6.26 → imt_ring-1.6.28}/src/ring/rendering/mujoco_render.py

@@ -8,7 +8,10 @@ from ring import maths
 
 _skybox = """<texture name="skybox" type="skybox" builtin="gradient" rgb1=".4 .6 .8" rgb2="0 0 0" width="800" height="800" mark="random" markrgb="1 1 1"/>"""  # noqa: E501
 _skybox_white = """<texture name="skybox" type="skybox" builtin="gradient" rgb1="1 1 1" rgb2="1 1 1" width="800" height="800" mark="random" markrgb="1 1 1"/>"""  # noqa: E501
-_floor = """<geom name="floor" pos="0 0 -0.5" size="0 0 1" type="plane" material="matplane" mass="0"/>"""  # noqa: E501
+
+
+def _floor(floor_z: float) -> str:
+    return f"""<geom name="floor" pos="0 0 {floor_z}" size="0 0 1" type="plane" material="matplane" mass="0"/>"""  # noqa: E501
 
 
 def _build_model_of_geoms(
@@ -16,6 +19,7 @@ def _build_model_of_geoms(
     cameras: dict[int, Sequence[str]],
     lights: dict[int, Sequence[str]],
     floor: bool,
+    floor_z: float,
     stars: bool,
     debug: bool,
 ) -> mujoco.MjModel:
@@ -75,6 +79,8 @@ def _build_model_of_geoms(
   <asset>
     <texture name="texplane" type="2d" builtin="checker" rgb1=".25 .25 .25" rgb2=".3 .3 .3" width="512" height="512" mark="cross" markrgb=".8 .8 .8"/>
     <material name="matplane" reflectance="0.3" texture="texplane" texrepeat="1 1" texuniform="true"/>
+    <texture type="2d" name="groundplane" builtin="checker" mark="edge" rgb1="0.2 0.3 0.4" rgb2="0.1 0.2 0.3" markrgb="0.8 0.8 0.8" width="300" height="300"/>
+    <material name="groundplane" texture="groundplane" texuniform="true" texrepeat="2 2" reflectance="0.2"/>
     {_skybox if stars else ''}
     <texture name="grid" type="2d" builtin="checker" rgb1=".1 .2 .3" rgb2=".2 .3 .4" width="300" height="300" mark="edge" markrgb=".2 .3 .4"/>
     <material name="grid" texture="grid" texrepeat="1 1" texuniform="true" reflectance=".2"/>
@@ -92,7 +98,7 @@ def _build_model_of_geoms(
 <camera pos="0 -1 1" name="target" mode="targetbodycom" target="{targetbody}"/>
 <camera pos="0 -3 3" name="targetfar" mode="targetbodycom" target="{targetbody}"/>
 <camera pos="0 -5 5" name="targetFar" mode="targetbodycom" target="{targetbody}"/>
-{_floor if floor else ''}
+{_floor(floor_z) if floor else ''}
 {inside_worldbody_cameras}
 {inside_worldbody_lights}
 {inside_worldbody}
@@ -169,6 +175,7 @@ class MujocoScene:
         add_lights: dict[int, str | Sequence[str]] = _default_lights,
         show_stars: bool = True,
         show_floor: bool = True,
+        floor_z: float = -0.84,
         debug: bool = False,
     ) -> None:
         self.debug = debug
@@ -183,6 +190,7 @@ class MujocoScene:
         self.add_cameras, self.add_lights = to_list(add_cameras), to_list(add_lights)
         self.show_stars = show_stars
         self.show_floor = show_floor
+        self.floor_z = floor_z
 
     def init(self, geoms: list[base.Geometry]):
         self._parent_ids = list(set([geom.link_idx for geom in geoms]))
@@ -191,6 +199,7 @@ class MujocoScene:
             self.add_cameras,
             self.add_lights,
             floor=self.show_floor,
+            floor_z=self.floor_z,
             stars=self.show_stars,
             debug=self.debug,
         )