Merge branch 'dev'

yossawat-suw · Feb 11, 2024 · aee0022 · aee0022
2 parents af185b9 + a374b98
commit aee0022
Show file tree

Hide file tree

Showing 194 changed files with 393,921 additions and 255,524 deletions.
diff --git a/ProbAge.py b/ProbAge.py
@@ -5,7 +5,7 @@
 import streamlit as st
 
 from modules.loading import test_limits, upload_data
-from modules import loading, inferring
+from modules import loading
 import modules
 
 from src import modelling_bio_beta as modelling
@@ -25,7 +25,7 @@
 if 'SITE_INFO' not in st.session_state:
     st.session_state.SITE_INFO = pd.read_csv(site_info_path, index_col=0)
 if 'PARAMS'  not in st.session_state:
-    st.session_state.PARAMS = modelling.PARAMS
+    st.session_state.PARAMS = list(modelling.SITE_PARAMETERS.values())
 
 
 st.warning('Put the paper here')

diff --git a/README.md b/README.md
@@ -3,4 +3,5 @@
 To run the Rscript
 `Rscript scripts/load.R `
 
-`mamba env update --file env/NSEA_env.yml --prune`
+`mamba env update --file env/NSEA_env.yml --prune`
+`mamba env update --file env/probage.yml --prune`
diff --git a/_obsidian/Document.md b/_obsidian/Document.md
diff --git a/_obsidian/Exports/Document.docx b/_obsidian/Exports/Document.docx
diff --git a/_obsidian/Exports/Document.latex b/_obsidian/Exports/Document.latex
diff --git a/_obsidian/Exports/Document.md b/_obsidian/Exports/Document.md
diff --git a/_obsidian/Exports/Document.odt b/_obsidian/Exports/Document.odt
diff --git a/_obsidian/Exports/Document.pdf b/_obsidian/Exports/Document.pdf
diff --git a/_obsidian/Figures/acc_bias_change.png b/_obsidian/Figures/acc_bias_change.png
diff --git a/_obsidian/Figures/acc_bias_map.png b/_obsidian/Figures/acc_bias_map.png
diff --git a/_obsidian/Figures/acc_bias_posterior.png b/_obsidian/Figures/acc_bias_posterior.png
diff --git a/_obsidian/Figures/accelerated_invidividual.png b/_obsidian/Figures/accelerated_invidividual.png
diff --git a/_obsidian/Figures/age-offset-problem.png b/_obsidian/Figures/age-offset-problem.png
diff --git a/_obsidian/Figures/biased_individual.png b/_obsidian/Figures/biased_individual.png
diff --git a/_obsidian/Figures/lin_drift_comparison.png b/_obsidian/Figures/lin_drift_comparison.png
diff --git a/_obsidian/Figures/methylation_data_sourcing.png b/_obsidian/Figures/methylation_data_sourcing.png
diff --git a/_obsidian/Figures/methylation_value_slice.png b/_obsidian/Figures/methylation_value_slice.png
diff --git a/_obsidian/Figures/model_comparison_hist.png b/_obsidian/Figures/model_comparison_hist.png
diff --git a/_obsidian/Figures/site-selection-threshold.png b/_obsidian/Figures/site-selection-threshold.png
diff --git a/_obsidian/Figures/site_filtering.png b/_obsidian/Figures/site_filtering.png
diff --git a/_obsidian/Figures/site_types.png b/_obsidian/Figures/site_types.png
diff --git a/_obsidian/Figures/smoker-site.png b/_obsidian/Figures/smoker-site.png
diff --git a/_obsidian/Figures/smoking_drinking_ANOVA.png b/_obsidian/Figures/smoking_drinking_ANOVA.png
diff --git a/_obsidian/Literature/@belsky2020quantification.md b/_obsidian/Literature/@belsky2020quantification.md
diff --git a/_obsidian/Literature/@bocklandt2011epigenetic.md b/_obsidian/Literature/@bocklandt2011epigenetic.md
diff --git a/_obsidian/Literature/@hannum2013genome.md b/_obsidian/Literature/@hannum2013genome.md
diff --git a/_obsidian/Literature/@horvath2013dna.md b/_obsidian/Literature/@horvath2013dna.md
diff --git a/_obsidian/Literature/@levine2018epigenetic.md b/_obsidian/Literature/@levine2018epigenetic.md
diff --git a/_obsidian/Literature/@lu2019dna.md b/_obsidian/Literature/@lu2019dna.md
diff --git a/_obsidian/Literature/@weidner2014aging.md b/_obsidian/Literature/@weidner2014aging.md
diff --git a/_obsidian/Literature/@zhang2017dna.md b/_obsidian/Literature/@zhang2017dna.md
diff --git a/_obsidian/Literature/@zhang2019improved.md b/_obsidian/Literature/@zhang2019improved.md
diff --git a/_obsidian/Math.md b/_obsidian/Math.md