Skip to content

Commit

Permalink
update webgestalt_lib
Browse files Browse the repository at this point in the history
  • Loading branch information
iblacksand committed Jan 16, 2024
1 parent 55100da commit 539ade6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ crate-type = ["cdylib"]
[dependencies]
pyo3 = "0.20.2"
rustc-hash = "1.1.0"
webgestalt_lib = "0.1.1"
webgestalt_lib = "0.2.0"
16 changes: 9 additions & 7 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use pyo3::exceptions::PyValueError;
use pyo3::prelude::*;
use pyo3::types::PyDict;
use webgestalt_lib::methods::gsea::{GSEAConfig, GSEAResult};
use webgestalt_lib::methods::multiomics::{multiomic_gsea, multiomic_ora, GSEAJob, ORAJob};
use webgestalt_lib::methods::multilist::{multilist_gsea, multilist_ora, GSEAJob, ORAJob};
use webgestalt_lib::methods::ora::{ORAConfig, ORAResult};
use webgestalt_lib::readers::utils::Item;

Expand Down Expand Up @@ -145,11 +145,12 @@ fn meta_gsea(py: Python, gmt: String, rank_files: Vec<String>) -> PyResult<Vec<V
}
}

let rust_result = multiomic_gsea(
let rust_result = multilist_gsea(
jobs,
webgestalt_lib::methods::multiomics::MultiOmicsMethod::Meta(
webgestalt_lib::methods::multiomics::MetaAnalysisMethod::Stouffer,
webgestalt_lib::methods::multilist::MultiListMethod::Meta(
webgestalt_lib::methods::multilist::MetaAnalysisMethod::Stouffer,
),
webgestalt_lib::stat::AdjustmentMethod::BH,
);
let mut final_results: Vec<Vec<&PyDict>> = Vec::new();
for res in rust_result {
Expand Down Expand Up @@ -287,11 +288,12 @@ fn meta_ora(
};
jobs.push(new_job);
}
let rust_result = multiomic_ora(
let rust_result = multilist_ora(
jobs,
webgestalt_lib::methods::multiomics::MultiOmicsMethod::Meta(
webgestalt_lib::methods::multiomics::MetaAnalysisMethod::Stouffer,
webgestalt_lib::methods::multilist::MultiListMethod::Meta(
webgestalt_lib::methods::multilist::MetaAnalysisMethod::Stouffer,
),
webgestalt_lib::stat::AdjustmentMethod::BH,
);
let mut final_results: Vec<Vec<&PyDict>> = Vec::new();
for res in rust_result {
Expand Down

0 comments on commit 539ade6

Please sign in to comment.