Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEW: peds-simulation action #58

Merged
merged 55 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
8f8d233
intial peds-bootstrap
cherman2 May 11, 2023
2a3aa9d
updates from EMC paper to peds-bootstrap
cherman2 May 8, 2024
9bc36f3
Merge branch 'dev' into peds-bootstrapping
cherman2 May 8, 2024
82a2e53
lint from merging
cherman2 May 8, 2024
8370ad8
add bootstrap to init
cherman2 May 8, 2024
0be6145
updates
cherman2 May 10, 2024
8930677
code dump
cherman2 May 14, 2024
12f6e02
lint
cherman2 May 14, 2024
30c0ae7
tests and examples
cherman2 May 14, 2024
761f133
Merge branch 'dev' of https://github.com/qiime2/q2-fmt into peds-boot…
cherman2 May 14, 2024
e5cef3b
merge py3.9 fixes
cherman2 May 14, 2024
cc45fd5
im alittle confused
cherman2 May 14, 2024
1287aa3
Merge branch 'dev' into peds-bootstrapping
cherman2 Jul 10, 2024
418fd4a
lint from conflict merge
cherman2 Jul 10, 2024
fdec4e5
simulation not bootstrap
cherman2 Jul 10, 2024
a0506de
simulation not bootstrap pt2
cherman2 Jul 10, 2024
bf2fd5c
secret boots
cherman2 Jul 10, 2024
75ddf76
ex
cherman2 Jul 10, 2024
b103953
imports
cherman2 Jul 10, 2024
27ed822
np.nan
cherman2 Jul 11, 2024
4280d89
address small comments and start stats
cherman2 Jul 11, 2024
69f842a
added per-subject-stats
cherman2 Jul 11, 2024
18b8811
stats refactor
cherman2 Jul 11, 2024
426ddbf
more stats
cherman2 Jul 11, 2024
858ab20
viz messing
cherman2 Jul 14, 2024
c7b564d
unittests
cherman2 Jul 15, 2024
db0ea7f
linty
cherman2 Jul 15, 2024
572f0c8
viz
cherman2 Jul 15, 2024
bed4608
different make stats
cherman2 Jul 15, 2024
d3621f2
evans stats request
cherman2 Jul 16, 2024
d2def81
leftovers
cherman2 Jul 17, 2024
77f0f03
REF: recipient shuffle
cherman2 Jul 19, 2024
e889ee7
helper-method-tests
cherman2 Jul 19, 2024
6bdef37
stats-bumper
cherman2 Jul 19, 2024
aaf1211
Merge branch 'dev' into peds-bootstrapping
cherman2 Jul 23, 2024
1c388cc
make stats
cherman2 Jul 23, 2024
abce832
Apply suggestions from code review
cherman2 Jul 25, 2024
d42f107
addresses Greg's Review
cherman2 Jul 25, 2024
c9dde88
addressing
cherman2 Jul 25, 2024
ee61f8a
ref: descriptions
cherman2 Jul 26, 2024
811f661
greg comments
cherman2 Jul 30, 2024
5af31bf
fix tests
cherman2 Jul 31, 2024
a2b4cd9
linty
cherman2 Jul 31, 2024
ae8b429
more tests
cherman2 Jul 31, 2024
22b61eb
Apply suggestions from code review
cherman2 Jul 31, 2024
caafb9a
review
cherman2 Aug 1, 2024
e3d3f04
fix doc string
cherman2 Aug 1, 2024
43ff167
fix cites
cherman2 Aug 1, 2024
7931b0e
more tests!
cherman2 Aug 1, 2024
28a772a
whitespace
cherman2 Aug 1, 2024
13661e5
Merge branch 'dev' into peds-bootstrapping
cherman2 Aug 8, 2024
78238f0
lint
cherman2 Aug 8, 2024
ea88903
dependency note
cherman2 Aug 14, 2024
dad7333
Update q2_fmt/plugin_setup.py
cherman2 Aug 14, 2024
3a1eb82
Update q2_fmt/plugin_setup.py
cherman2 Aug 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions q2_fmt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
# ----------------------------------------------------------------------------

from ._version import get_versions

from ._engraftment import cc, group_timepoints
from ._peds import sample_peds, feature_peds, peds, peds_heatmap
from ._peds import (sample_peds, feature_peds, peds, peds_heatmap,
peds_simulation)

__version__ = get_versions()['version']
del get_versions


__all__ = ['cc', 'sample_peds', 'feature_peds',
'peds', 'peds_heatmap', 'group_timepoints']
'peds', 'peds_heatmap', 'group_timepoints', 'peds_simulation']
24 changes: 24 additions & 0 deletions q2_fmt/_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,3 +234,27 @@ def peds_heatmap(use):
)

peds_heatmap.assert_output_type('Visualization')


def simulation_peds_method(use):
md = use.init_metadata('md', peds_md_factory)
peds_table = use.init_artifact('peds_table', peds_feature_table_factory)

peds_stats, global_stats = use.action(
use.UsageAction('fmt', 'peds_simulation'),
use.UsageInputs(
table=peds_table,
metadata=md,
time_column='time_point',
reference_column='Donor',
subject_column='SubjectID'
),
use.UsageOutputNames(
per_subject_stats='per_subject_stats',
global_stats='global_stats'
)

)

peds_stats.assert_output_type("StatsTable[Pairwise]")
global_stats.assert_output_type("StatsTable[Pairwise]")
Loading
Loading