Skip to content

Commit

Permalink
Pull request #51: HTTK-225 Merge Dev into Main v2.3.1
Browse files Browse the repository at this point in the history
Merge in HTTK/httk-dev from dev to main

* commit '68c6fa56e1d6f9589b67706c3d0a70a5d0e1b87c': (42 commits)
  Updated CCD tables
  Updating tests
  Change unit test for Mac M1 compliance
  Change unit test for Mac M1 compliance
  Plasma not blood
  (HTTK-217) added method and mf arguments to the unit test for solve_gas_pbtk which was missed last round, updated documentation with transparency about the OS precision diffs, updated documentation with roxygen2::roxygenize('~/Git/httk-dev/httk/')
  Update package help to roxygen default
  Fixes to state equal all and passes ascran
  Fixes to state equal all and passes ascran
  update documentation with roxygen2::roxygenise('~/Git/httk-dev/httk')
  (HTTK-215 & HTTK-219) make sure the default options provided in the documentation match those in 'get_fabsgut', only thing to change was Caco2.Pab.default from 2 to 1.6
  update documentation with roxygen2::roxygenise('~/Git/httk-dev/httk')
  (HTTK-215 & HTTK-219) Resolve issue with Caco2.options, needed to update documentation with correct argument option for Caco2.options (i.e. Caco2.Pab.default not Caco2.default)
  HTTK-208: Stopped rounding times in solve_model.R. Quickest fix to time precision problem.
  (HTTK-217) update the solve_gas_test R script for the pyrene cases with additional arguments to make results consistent across OS's with various different precisions - method = 'losde' and mf = 10
  Passed CRAN checks except for convert_units
  Changed stop to warning
  (HTTK-218) update 'scale_dosing' to be able to accept the 'state' argument now necessary for 'convert_units' & update 'solve_model' to pass the relevant compound state information for relevant compartments - all before data input passed to ODE solver
  Cleaned up dosing parameters
  Updated news
  ...
  • Loading branch information
jfwambaugh committed May 1, 2024
2 parents a82ae91 + 68c6fa5 commit 3246ec8
Show file tree
Hide file tree
Showing 109 changed files with 201,603 additions and 188,163 deletions.
14,638 changes: 7,319 additions & 7,319 deletions datatables/HTTK-AllChems.smi

Large diffs are not rendered by default.

14,615 changes: 7,311 additions & 7,304 deletions datatables/HTTK-Chem-Props.txt

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions datatables/HTTK-ChemIDs-1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1988,13 +1988,13 @@ NOCAS_47346
126-72-7
93-35-6
112733-06-9
3470-36-8
5328-41-6
313-06-4
115-31-1
2439-07-8
1948-33-0
2437-29-8
118-10-5
106-24-1
150-30-1
100-06-1
100-10-7
100-11-8
100-14-1
100-15-2
100-18-5
100-19-6
100-20-9
100-21-0
100-22-1
Loading

0 comments on commit 3246ec8

Please sign in to comment.