-
Notifications
You must be signed in to change notification settings - Fork 53
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
Fixes #2621. Fixes #2622 #2630
Merged
msevestre
merged 3 commits into
OSMOSES
from
2621-hi-check-if-the-double-scaling-of-q_liver-is-correct
May 20, 2023
Merged
Fixes #2621. Fixes #2622 #2630
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,14 +36,14 @@ private static HIFactors createFactors(double forA, double forB, double forC) => | |
}; | ||
|
||
private static readonly HIFactors _portalFlowScalingFactor = createFactors(0.4, 0.36, 0.04); | ||
private static readonly HIFactors _hepaticFlowScalingFactor = createFactors(1.3, 2.3, 3.4); | ||
private static readonly HIFactors _hepaticFlowScalingFactor = createFactors(1.61, 2.34, 5.29); | ||
private static readonly HIFactors _hepaticVolumeScalingFactor = createFactors(0.69, 0.55, 0.28); | ||
private static readonly HIFactors _renalFlowScalingFactor = createFactors(0.88, 0.65, 0.48); | ||
private static readonly HIFactors _cardiacIndexScalingFactor = createFactors(1.11, 1.27, 1.36); | ||
private static readonly HIFactors _gfrScalingFactor = createFactors(1, 0.7, 0.36); | ||
private static readonly HIFactors _albuminScalingFactor = createFactors(0.81, 0.68, 0.5); | ||
private static readonly HIFactors _agpScalingFactor = createFactors(0.6, 0.56, 0.3); | ||
private static readonly HIFactors _hematocritScalingFactor = createFactors(0.92, 0.88, 0.83); | ||
private static readonly HIFactors _hematocritScalingFactor = createFactors(0.86, 0.822, 0.778); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In #2621 (comment) HCT-Scalefactor for A is 0.866 |
||
|
||
private static readonly Cache<string, HIFactors> _moleculeScalingFactorEdginton = new() | ||
{ | ||
|
@@ -148,8 +148,8 @@ private void updateBloodFlowsAndVolumes(Individual individual, Action<ParameterU | |
var Q_portal = portalOrgans.Sum(bloodFlow); | ||
var Q_other = otherOrgans.Sum(bloodFlow); | ||
var Q_brain = bloodFlow(BRAIN); | ||
var Q_liver = bloodFlow(LIVER); | ||
var Q_kidney = bloodFlow(KIDNEY); | ||
var Q_liver = bloodFlow(LIVER); | ||
|
||
var portal_factor = _portalFlowScalingFactor[score]; | ||
var liver_factor = _hepaticFlowScalingFactor[score]; | ||
|
@@ -168,8 +168,8 @@ private void updateBloodFlowsAndVolumes(Individual individual, Action<ParameterU | |
|
||
//retrieve the scaling factor based on publication and github entry | ||
//see https://github.com/Open-Systems-Pharmacology/Forum/discussions/1341 | ||
var otherOrganFactor = (ci_factor * (Q_other + Q_portal + Q_kidney + Q_liver + Q_brain) - (Q_brain + Q_portal * portal_factor + Q_liver_HI * liver_factor + Q_kidney * kidney_factor)) / Q_other; | ||
otherOrgans.Each(x => updateBloodFlowSpec(x, otherOrganFactor)); | ||
var otherOrganDiseaseFactor = (ci_factor * (Q_other + Q_portal + Q_kidney + Q_liver + Q_brain) - (Q_brain + Q_portal * portal_factor + Q_liver_HI * liver_factor + Q_kidney * kidney_factor)) / Q_other; | ||
otherOrgans.Each(x => updateBloodFlowSpec(x, otherOrganDiseaseFactor)); | ||
} | ||
|
||
private Action<string, double> updateBloodFlowSpecDef(Action<ParameterUpdate> updateParameterFunc, IContainer organism) => (organName, factor) => | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I understood the discussion in #2621 the value origin for the blood flow factors must be changed now from Edginton to Johnson?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ha ha this is correct. Eagle eye Juri