Skip to content

Commit

Permalink
more:
Browse files Browse the repository at this point in the history
  • Loading branch information
mavaylon1 committed Oct 24, 2024
1 parent 1e22f8e commit c2a298f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 36 deletions.
Binary file removed SortedQueryTest.h5
Binary file not shown.
2 changes: 1 addition & 1 deletion src/hdmf/build/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ def __deepcopy__(self, memo):
# needing this argument in deepcopy. Doesn't hurt anything, though.
return self.__copy__()

def copy_mappers(self, type_map):
def copy_mappers(self, type_map): # pragma: no cover
for namespace in self.__ns_catalog.namespaces:
if namespace not in type_map.__container_types:
continue
Expand Down
48 changes: 15 additions & 33 deletions src/hdmf/build/objectmapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -963,41 +963,23 @@ def _filler():
return _filler

def __get_ref_builder(self, builder, dtype, shape, container, build_manager):
bldr_data = None
if dtype.is_region():
if shape is None:
if not isinstance(container, DataRegion):
msg = "'container' must be of type DataRegion if spec represents region reference"
raise ValueError(msg)
self.logger.debug("Setting %s '%s' data to region reference builder"
% (builder.__class__.__name__, builder.name))
target_builder = self.__get_target_builder(container.data, build_manager, builder)
bldr_data = RegionBuilder(container.region, target_builder)
else:
self.logger.debug("Setting %s '%s' data to list of region reference builders"
% (builder.__class__.__name__, builder.name))
bldr_data = list()
for d in container.data:
target_builder = self.__get_target_builder(d.target, build_manager, builder)
bldr_data.append(RegionBuilder(d.slice, target_builder))
self.logger.debug("Setting object reference dataset on %s '%s' data"
% (builder.__class__.__name__, builder.name))
if isinstance(container, Data):
self.logger.debug("Setting %s '%s' data to list of reference builders"
% (builder.__class__.__name__, builder.name))
bldr_data = list()
for d in container.data:
target_builder = self.__get_target_builder(d, build_manager, builder)
bldr_data.append(ReferenceBuilder(target_builder))
if isinstance(container.data, H5DataIO):
# This is here to support appending a dataset of references.
bldr_data = H5DataIO(bldr_data, **container.data.get_io_params())
else:
self.logger.debug("Setting object reference dataset on %s '%s' data"
self.logger.debug("Setting %s '%s' data to reference builder"
% (builder.__class__.__name__, builder.name))
if isinstance(container, Data):
self.logger.debug("Setting %s '%s' data to list of reference builders"
% (builder.__class__.__name__, builder.name))
bldr_data = list()
for d in container.data:
target_builder = self.__get_target_builder(d, build_manager, builder)
bldr_data.append(ReferenceBuilder(target_builder))
if isinstance(container.data, H5DataIO):
# This is here to support appending a dataset of references.
bldr_data = H5DataIO(bldr_data, **container.data.get_io_params())
else:
self.logger.debug("Setting %s '%s' data to reference builder"
% (builder.__class__.__name__, builder.name))
target_builder = self.__get_target_builder(container, build_manager, builder)
bldr_data = ReferenceBuilder(target_builder)
target_builder = self.__get_target_builder(container, build_manager, builder)
bldr_data = ReferenceBuilder(target_builder)
return bldr_data

def __get_target_builder(self, container, build_manager, builder):
Expand Down
2 changes: 0 additions & 2 deletions src/hdmf/region.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from .utils import docval, getargs


# pragma: no cover
class RegionSlicer(DataRegion, metaclass=ABCMeta):
'''
A abstract base class to control getting using a region
Expand Down Expand Up @@ -52,7 +51,6 @@ def __len__(self):
pass


# pragma: no cover
class ListSlicer(RegionSlicer):
"""Implementation of RegionSlicer for slicing Lists and Data"""

Expand Down

0 comments on commit c2a298f

Please sign in to comment.