Skip to content

Cleaned code from dev meeting (10/4/2023)#91

Merged
rhimj merged 1 commit into
CryPTSys:developfrom
djlaky:develop
Oct 5, 2023
Merged

Cleaned code from dev meeting (10/4/2023)#91
rhimj merged 1 commit into
CryPTSys:developfrom
djlaky:develop

Conversation

@djlaky
Copy link
Copy Markdown
Collaborator

@djlaky djlaky commented Oct 4, 2023

  1. Changed Kinetics to correctly require 'partic_species' to function when stoich_matrix is supplied (lost old functionalities).

https://github.com/dlakes94/PharmaPy/blob/136d5384227417426e7f0bf4f64d24dbdd5861aa/PharmaPy/Kinetics.py#L242-L243

  1. Changed cyipopt to be an optional import. Included try/except on import and throw an error when cyipopt is not found when 'IPOPT' is specified as the method for parameter estimation. Tested and works well.

https://github.com/dlakes94/PharmaPy/blob/136d5384227417426e7f0bf4f64d24dbdd5861aa/PharmaPy/ParamEstim.py#L25-L29

https://github.com/dlakes94/PharmaPy/blob/136d5384227417426e7f0bf4f64d24dbdd5861aa/PharmaPy/ParamEstim.py#L622-L623

  1. Added negatives that were lost in translating code to remove deprecated method dependency. (Lines 694, 1054, 1562, and 1675 in Reactors.py --> https://github.com/dlakes94/PharmaPy/blob/136d5384227417426e7f0bf4f64d24dbdd5861aa/PharmaPy/Reactors.py)

  2. Updated requirements.txt to get rid of optional dependency (cyipopt). See "1." above.

  3. Updated setup.py to be more readable and succinct the file given by another user. (https://github.com/yoooruz/PharmaPy/blob/master/setup.py)

@djlaky djlaky requested review from rhimj and ybarhate0812 October 4, 2023 23:35
@djlaky djlaky mentioned this pull request Oct 5, 2023
Copy link
Copy Markdown
Collaborator

@ybarhate0812 ybarhate0812 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks Dan!

Copy link
Copy Markdown
Collaborator

@rhimj rhimj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@rhimj rhimj merged commit 679d367 into CryPTSys:develop Oct 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants