p2p-ld/nwb-linkml
1
0
Fork 0
mirror of https://github.com/p2p-ld/nwb-linkml.git synced 2025-01-10 06:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix name array -> value in hdmf mixins

Browse source
This commit is contained in:
sneakers-the-rat 2024-08-05 17:06:59 -07:00
parent 0a150d6bc2
commit 374bd8971d
Signed by untrusted user who does not match committer: jonny
GPG key ID: 6DCB96EF1E4D232D
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
nwb_linkml/src/nwb_linkml/includes/hdmf.py
View file

@ -187,21 +187,21 @@ class VectorDataMixin(BaseModel):
_index: Optional["VectorIndex"] = None _index: Optional["VectorIndex"] = None
# redefined in `VectorData`, but included here for testing and type checking # redefined in `VectorData`, but included here for testing and type checking
array: Optional[NDArray] = None value: Optional[NDArray] = None
def __getitem__(self, item: Union[str, int, slice, Tuple[Union[str, int, slice], ...]]) -> Any: def __getitem__(self, item: Union[str, int, slice, Tuple[Union[str, int, slice], ...]]) -> Any:
if self._index: if self._index:
# Following hdmf, VectorIndex is the thing that knows how to do the slicing # Following hdmf, VectorIndex is the thing that knows how to do the slicing
return self._index[item] return self._index[item]
else: else:
return self.array[item] return self.value[item]
def __setitem__(self, key: Union[int, str, slice], value: Any) -> None: def __setitem__(self, key: Union[int, str, slice], value: Any) -> None:
if self._index: if self._index:
# Following hdmf, VectorIndex is the thing that knows how to do the slicing # Following hdmf, VectorIndex is the thing that knows how to do the slicing
self._index[key] = value self._index[key] = value
else: else:
self.array[key] = value self.value[key] = value
class VectorIndexMixin(BaseModel): class VectorIndexMixin(BaseModel):
@ -210,7 +210,7 @@ class VectorIndexMixin(BaseModel):
""" """
# redefined in `VectorData`, but included here for testing and type checking # redefined in `VectorData`, but included here for testing and type checking
array: Optional[NDArray] = None value: Optional[NDArray] = None
target: Optional["VectorData"] = None target: Optional["VectorData"] = None
def _getitem_helper(self, arg: int) -> Union[list, NDArray]: def _getitem_helper(self, arg: int) -> Union[list, NDArray]:
@ -218,18 +218,18 @@ class VectorIndexMixin(BaseModel):
Mimicking :func:`hdmf.common.table.VectorIndex.__getitem_helper` Mimicking :func:`hdmf.common.table.VectorIndex.__getitem_helper`
""" """
start = 0 if arg == 0 else self.array[arg - 1] start = 0 if arg == 0 else self.value[arg - 1]
end = self.array[arg] end = self.value[arg]
return self.target.array[slice(start, end)] return self.target.array[slice(start, end)]
def __getitem__(self, item: Union[int, slice]) -> Any: def __getitem__(self, item: Union[int, slice]) -> Any:
if self.target is None: if self.target is None:
return self.array[item] return self.value[item]
elif type(self.target).__name__ == "VectorData": elif type(self.target).__name__ == "VectorData":
if isinstance(item, int): if isinstance(item, int):
return self._getitem_helper(item) return self._getitem_helper(item)
else: else:
idx = range(*item.indices(len(self.array))) idx = range(*item.indices(len(self.value)))
return [self._getitem_helper(i) for i in idx] return [self._getitem_helper(i) for i in idx]
else: else:
raise NotImplementedError("DynamicTableRange not supported yet") raise NotImplementedError("DynamicTableRange not supported yet")
@ -239,7 +239,7 @@ class VectorIndexMixin(BaseModel):
# VectorIndex is the thing that knows how to do the slicing # VectorIndex is the thing that knows how to do the slicing
self._index[key] = value self._index[key] = value
else: else:
self.array[key] = value self.value[key] = value
DYNAMIC_TABLE_IMPORTS = Imports( DYNAMIC_TABLE_IMPORTS = Imports(

1
scripts/generate_core.py
View file

@ -1,4 +1,3 @@
import pdb
import shutil import shutil
import os import os
import traceback import traceback