Skip to content
Snippets Groups Projects
Commit 60047d25 authored by Timo Birr's avatar Timo Birr :rage:
Browse files

Uggly quickfix to make mitigate the renaming from AronIceTypes to...

Uggly quickfix to make mitigate the renaming from AronIceTypes to AronDataIceTypes that breaks A LOT
parent 2d767584
No related branches found
No related tags found
No related merge requests found
Pipeline #22412 passed
from .import_aron_slice import import_aron_slice from .import_aron_slice import import_aron_slice
from .aron_ice_types import AronDataIceTypes from .aron_ice_types import AronDataIceTypes, AronIceTypes
from .aron_type_ice_types import AronTypeIceTypes from .aron_type_ice_types import AronTypeIceTypes
...@@ -3,6 +3,57 @@ from .import_aron_slice import import_aron_slice ...@@ -3,6 +3,57 @@ from .import_aron_slice import import_aron_slice
armarx_aron = import_aron_slice() armarx_aron = import_aron_slice()
data_dto = armarx_aron.data.dto data_dto = armarx_aron.data.dto
class AronIceTypes:
ARON_VERSION = armarx_aron.Version()
Version = armarx_aron.Version
Data = data_dto.GenericData
String = data_dto.AronString
Bool = data_dto.AronBool
Int = data_dto.AronInt
Long = data_dto.AronLong
Float = data_dto.AronFloat
Double = data_dto.AronDouble
List = data_dto.List
Dict = data_dto.Dict
NDArray = data_dto.NDArray
@classmethod
def string(cls, value: str) -> String:
return cls.String(value=value, VERSION=cls.ARON_VERSION)
@classmethod
def bool(cls, value: int) -> Bool:
return cls.Bool(value=value, VERSION=cls.ARON_VERSION)
@classmethod
def int(cls, value: int) -> Int:
return cls.Int(value=value, VERSION=cls.ARON_VERSION)
@classmethod
def long(cls, value: int) -> Long:
return cls.Long(value=value, VERSION=cls.ARON_VERSION)
@classmethod
def float(cls, value: float) -> Float:
return cls.Float(value=value, VERSION=cls.ARON_VERSION)
@classmethod
def double(cls, value: float) -> Double:
return cls.Double(value=value, VERSION=cls.ARON_VERSION)
@classmethod
def list(cls, elements: list) -> List:
return cls.List(elements=elements, VERSION=cls.ARON_VERSION)
@classmethod
def dict(cls, elements: dict) -> Dict:
return cls.Dict(elements=elements, VERSION=cls.ARON_VERSION)
class AronDataIceTypes: class AronDataIceTypes:
ARON_VERSION = armarx_aron.Version() ARON_VERSION = armarx_aron.Version()
......
...@@ -5,7 +5,7 @@ import numpy as np ...@@ -5,7 +5,7 @@ import numpy as np
import typing as ty import typing as ty
import armarx import armarx
from armarx_memory.aron.aron_ice_types import AronDataIceTypes from armarx_memory.aron.aron_ice_types import AronDataIceTypes, AronIceTypes
def pythonic_to_aron_ice( def pythonic_to_aron_ice(
......
...@@ -257,8 +257,8 @@ class Reader: ...@@ -257,8 +257,8 @@ class Reader:
@classmethod @classmethod
def for_each_instance_data_ice( def for_each_instance_data_ice(
cls, cls,
fn: ty.Callable[[dto.MemoryID, AronIceTypes.Dict], ty.Any] or fn: ty.Callable[[dto.MemoryID, AronDataIceTypes.Dict], ty.Any] or
ty.Callable[[dto.MemoryID, dto.EntityInstanceMetadata, AronIceTypes.Dict], ty.Any], ty.Callable[[dto.MemoryID, dto.EntityInstanceMetadata, AronDataIceTypes.Dict], ty.Any],
data: ty.Union[ data: ty.Union[
dto.Memory, dto.Memory,
dto.CoreSegment, dto.CoreSegment,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment