Skip to content

Commit

Permalink
Merge pull request #77 from klarman-cell-observatory/yiming
Browse files Browse the repository at this point in the history
Fix issue on UnimodalData constructor
  • Loading branch information
yihming committed Nov 5, 2021
2 parents 88bd524 + c84ec5a commit e54cf57
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 8 deletions.
5 changes: 5 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 0.4.1 `November 4, 2021`
----------------------------------

- Fix issues on ``UnimodalData`` object construction.

Version 0.4.0 `October 19, 2021`
---------------------------------

Expand Down
29 changes: 21 additions & 8 deletions pegasusio/unimodal_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ def _set_modality(metadata: dict, modality: str):
class UnimodalData:
def __init__(
self,
barcode_metadata: Union[dict, pd.DataFrame, anndata.AnnData] = pd.DataFrame(),
feature_metadata: Union[dict, pd.DataFrame] = pd.DataFrame(),
matrices: Dict[str, csr_matrix] = dict(),
metadata: dict = dict(),
barcode_multiarrays: Dict[str, np.ndarray] = dict(),
feature_multiarrays: Dict[str, np.ndarray] = dict(),
barcode_multigraphs: Dict[str, csr_matrix] = dict(),
feature_multigraphs: Dict[str, csr_matrix] = dict(),
barcode_metadata: Union[dict, pd.DataFrame, anndata.AnnData] = None,
feature_metadata: Union[dict, pd.DataFrame] = None,
matrices: Dict[str, csr_matrix] = None,
metadata: dict = None,
barcode_multiarrays: Dict[str, np.ndarray] = None,
feature_multiarrays: Dict[str, np.ndarray] = None,
barcode_multigraphs: Dict[str, csr_matrix] = None,
feature_multigraphs: Dict[str, csr_matrix] = None,
cur_matrix: str = "X",
genome: str = None,
modality: str = None,
Expand All @@ -55,6 +55,19 @@ def __init__(
self.from_anndata(barcode_metadata, genome = genome, modality = modality)
return None

if barcode_metadata is None:
barcode_metadata = pd.DataFrame()
if feature_metadata is None:
feature_metadata = pd.DataFrame()
if barcode_multiarrays is None:
barcode_multiarrays = dict()
if feature_multiarrays is None:
feature_multiarrays = dict()
if barcode_multigraphs is None:
barcode_multigraphs = dict()
if feature_multigraphs is None:
feature_multigraphs = dict()

_set_genome(metadata, genome)
_set_modality(metadata, modality)

Expand Down

0 comments on commit e54cf57

Please sign in to comment.