Skip to content

Commit

Permalink
wip,fix: added deleter to on psm dataset
Browse files Browse the repository at this point in the history
  • Loading branch information
jspaezp committed Dec 6, 2024
1 parent d6f58ac commit 73a0e14
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
12 changes: 7 additions & 5 deletions mokapot/brew.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import copy
import logging
from operator import itemgetter
from typing import Iterable
from typing import Iterable, Generator

import numpy as np
import pandas as pd
Expand Down Expand Up @@ -304,7 +304,9 @@ def brew(


# Utility Functions -----------------------------------------------------------
def make_train_sets(test_idx, subset_max_train, data_size, rng):
def make_train_sets(
test_idx, subset_max_train, data_size, rng
) -> Generator[list[list[int]], None, None]:
"""
Parameters
----------
Expand All @@ -317,8 +319,8 @@ def make_train_sets(test_idx, subset_max_train, data_size, rng):
Yields
------
PsmDataset
The training set.
list of list of int
The training set. Each element is a list of ints.
"""
subset_max_train_per_file = []
if subset_max_train is not None:
Expand Down Expand Up @@ -356,7 +358,7 @@ def make_train_sets(test_idx, subset_max_train, data_size, rng):
if current_subset_max_train < train_idx_size:
train_idx[i] = rng.choice(
train_idx[i], current_subset_max_train, replace=False
)
).tolist()
yield train_idx


Expand Down
6 changes: 5 additions & 1 deletion mokapot/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -659,12 +659,16 @@ def target_column(self) -> str:

@property
def feature_columns(self) -> list[str]:
return self._feature_columns
return list(self._feature_columns)

@property
def spectra_dataframe(self) -> pd.DataFrame:
return self._spectra_dataframe

@spectra_dataframe.deleter
def spectra_dataframe(self):
del self._spectra_dataframe

def get_column_names(self) -> list[str]:
columns = self.reader.get_column_names()
return columns
Expand Down

0 comments on commit 73a0e14

Please sign in to comment.