Skip to content

Commit 10817ee

Browse files
mcmcdanielmcmcdaniel
committed
fix/substanceState: Add "WholeBlood" to cmd_bio subGenerator
GenData did not have a case for Classification = WholeBlood, so subs with this classification were not correctly parsed. Change "State" of antigens to "Molecular" because previous value of "Cellular" did not exist on schema.
1 parent 6d97dfb commit 10817ee

36 files changed

+112
-128
lines changed

‎projects/cmd_bio/src/data/SubstanceGenerator.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ bool SubstanceGenerator::process(const std::string& name, const std::string& val
128128
substance.State(SubstanceData::State_type::Gas);
129129
} else if ("Molecular" == value) {
130130
substance.State(SubstanceData::State_type::Molecular);
131-
} else {
131+
} else {
132132
rValue = false;
133133
}
134134
} else if ("Classification" == name) {
@@ -144,7 +144,10 @@ bool SubstanceGenerator::process(const std::string& name, const std::string& val
144144
substance.Classification(SubstanceData::Classification_type::ReversalAgent);
145145
} else if ("Sedative" == value) {
146146
substance.Classification(SubstanceData::Classification_type::Sedative);
147-
} else if ("" == value) {
147+
} else if ("WholeBlood" == value) {
148+
substance.Classification(SubstanceData::Classification_type::WholeBlood);
149+
}
150+
else if ("" == value) {
148151
//Classification is Optional and need not be set
149152
} else {
150153
rValue = false;

‎share/data/BioGears.xlsx‎

-31 Bytes
Binary file not shown.

‎share/data/Substances.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name,CarbonDioxide,CarbonMonoxide, Nitrogen,Oxygen,Bicarbonate,Calcium,Chloride,Potassium,Sodium,Epinephrine,Glucagon,Insulin,AminoAcids,Creatinine,Glucose,Ketones,Lactate,Triacylglycerol,Urea,Acetaminophen,Albuterol, Desflurane,Ertapenem, Fentanyl,Furosemide, Ketamine, Midazolam, Morphine,Moxifloxacin, Naloxone,Norepinephrine,Piperacillin,Pralidoxime,Prednisone, Propofol,Rocuronium,Sarin, Succinylcholine,Tazobactam,TranexamicAcid,Vasopressin,Albumin,Globulin,Hemoglobin,Oxyhemoglobin ,Carboxyhemoglobin ,Carbaminohemoglobin ,OxyCarbaminohemoglobin ,ForestFireParticulate,Antigen_A,Antigen_B,Platelet,RedBloodCell,WhiteBloodCell
22
Substance (State req'd others optional),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
3-
State,Gas,Gas,Gas,Gas,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Solid,Liquid,Gas,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Molecular,Molecular,Molecular,Molecular,Molecular,Solid,Cellular,Cellular,Cellular,Cellular,Cellular
3+
State,Gas,Gas,Gas,Gas,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Solid,Liquid,Gas,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Molecular,Molecular,Molecular,Molecular,Molecular,Solid,Molecular,Molecular,Molecular,Molecular,Molecular
44
Classification,,,,,,Ion,Ion,Ion,Ion,,,,,,,,,,,,,Anesthetic,Antibiotic,Opioid,,Anesthetic,Sedative,Opioid,Antibiotic,ReversalAgent,,Antibiotic,ReversalAgent,,Anesthetic,Anesthetic,,Anesthetic,Antibiotic,,,,,,,,,,,WholeBlood,WholeBlood,WholeBlood,WholeBlood,WholeBlood
55
Density,1842.12 g/m^3,1165 g/m^3,1251 g/m^3,1429 g/m^3,,,,,,,,,,,,,,875.2 kg/m^3,,1.293 g/cm^3,3213 g/m^3,6610 g/m^3,,,,,,,,,,,,,,,1100 kg/m^3,,,,,,,,,,,,,,,1.06 g/mL,1.1 g/mL,1.08 g/mL
66
MaximumDiffusionFlux,,,,,,,,,,,,,,,1 g/cm^2 s,0.5 g/cm^2 s,,0.5 g/cm^2 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

‎share/data/substances/Acetaminophen.xml‎

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<Substance xmlns="uri:/mil/tatrc/physiology/datamodel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" contentVersion="BioGears_6.1.1-beta" xsi:schemaLocation="">
3-
<Name>Acetaminophen</Name>
4-
<Density readOnly="false" unit="g/cm^3" value="1.293"/>
5-
<MolarMass value="151.163" unit="g/mol"/>
6-
<State>Solid</State>
7-
<Clearance>
8-
<Systemic>
9-
<FractionExcretedInFeces value="0.0"/>
10-
<FractionUnboundInPlasma value="0.9"/>
11-
<IntrinsicClearance value="0.5" unit="mL/min kg"/>
12-
<RenalClearance value="4.5" unit="mL/min kg"/>
13-
<SystemicClearance value="0.5" unit="mL/min kg"/>
14-
</Systemic>
15-
<RenalDynamics>
16-
<Clearance readOnly="false" unit="mL/min kg" value="4.5"/>
17-
</RenalDynamics>
18-
</Clearance>
19-
<Pharmacokinetics>
20-
<Physicochemicals>
21-
<AcidDissociationConstant readOnly="false" value="9.78"/>
22-
<BindingProtein>Albumin</BindingProtein>
23-
<BloodPlasmaRatio readOnly="false" value="1.05"/>
24-
<FractionUnboundInPlasma readOnly="false" value="0.9"/>
25-
<IonicState>Acid</IonicState>
26-
<LogP readOnly="false" value="0.46"/>
27-
<HydrogenBondCount readOnly="false" value="4"/>
28-
<PolarSurfaceArea readOnly="false" value="49.3"/>
29-
</Physicochemicals>
30-
</Pharmacokinetics>
31-
<Pharmacodynamics>
32-
<Bronchodilation readOnly="false" value="0"/>
33-
<DiastolicPressureModifier readOnly="false" value="0.0"/>
34-
<EC50 readOnly="false" unit="ug/mL" value="5.17"/>
35-
<EMaxShapeParameter readOnly="false" value="9.98"/>
36-
<FeverModifier readOnly="false" value="0.1"/>
37-
<HeartRateModifier readOnly="false" value="0.0"/>
38-
<HemorrhageModifier readOnly="false" value="0"/>
39-
<NeuromuscularBlock readOnly="false" value="0"/>
40-
<PainModifier readOnly="false" value="0.05"/>
41-
<PupillaryResponse>
42-
<ReactivityModifier readOnly="false" value="0.0"/>
43-
<SizeModifier readOnly="false" value="0.0"/>
44-
</PupillaryResponse>
45-
<RespirationRateModifier readOnly="false" value="0.0"/>
46-
<Sedation readOnly="false" value="0"/>
47-
<SystolicPressureModifier readOnly="false" value="0.0"/>
48-
<TidalVolumeModifier readOnly="false" value="0"/>
49-
<TubularPermeabilityModifier readOnly="false" value="0"/>
50-
<CentralNervousModifier readOnly="false" value="0"/>
51-
<AntibacterialEffect readOnly="false" unit="1/hr" value="0"/>
52-
<EffectSiteRateConstant readOnly="false" unit="1/min" value="0.0"/>
53-
</Pharmacodynamics>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
2+
<Substance xmlns="uri:/mil/tatrc/physiology/datamodel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="uri:/mil/tatrc/physiology/datamodel BioGears.xsd">
3+
<Name>Acetaminophen</Name>
4+
<Density readOnly="false" unit="g/cm^3" value="1.293"/>
5+
<MolarMass readOnly="false" unit="g/mol" value="151.163"/>
6+
<State>Solid</State>
7+
<Clearance>
8+
<Systemic>
9+
<FractionExcretedInFeces readOnly="false" value="0"/>
10+
<FractionUnboundInPlasma readOnly="false" value="0.9"/>
11+
<IntrinsicClearance readOnly="false" unit="mL/min kg" value="0.5"/>
12+
<RenalClearance readOnly="false" unit="mL/min kg" value="4.5"/>
13+
<SystemicClearance readOnly="false" unit="mL/min kg" value="0.5"/>
14+
</Systemic>
15+
<RenalDynamics>
16+
<Clearance readOnly="false" unit="mL/min kg" value="4.5"/>
17+
</RenalDynamics>
18+
</Clearance>
19+
<Pharmacokinetics>
20+
<Physicochemicals>
21+
<AcidDissociationConstant readOnly="false" value="9.78"/>
22+
<BindingProtein>Albumin</BindingProtein>
23+
<BloodPlasmaRatio readOnly="false" value="1.05"/>
24+
<FractionUnboundInPlasma readOnly="false" value="0.9"/>
25+
<IonicState>Acid</IonicState>
26+
<LogP readOnly="false" value="0.46"/>
27+
<HydrogenBondCount readOnly="false" value="4"/>
28+
<PolarSurfaceArea readOnly="false" value="49.3"/>
29+
</Physicochemicals>
30+
</Pharmacokinetics>
31+
<Pharmacodynamics>
32+
<Bronchodilation readOnly="false" value="0"/>
33+
<DiastolicPressureModifier readOnly="false" value="0"/>
34+
<EC50 readOnly="false" unit="" value="5.17"/>
35+
<EMaxShapeParameter readOnly="false" value="9.98"/>
36+
<FeverModifier readOnly="false" value="0.1"/>
37+
<HeartRateModifier readOnly="false" value="0"/>
38+
<HemorrhageModifier readOnly="false" value="0"/>
39+
<NeuromuscularBlock readOnly="false" value="0"/>
40+
<PainModifier readOnly="false" value="0.05"/>
41+
<PupillaryResponse>
42+
<ReactivityModifier readOnly="false" value="0"/>
43+
<SizeModifier readOnly="false" value="0"/>
44+
</PupillaryResponse>
45+
<RespirationRateModifier readOnly="false" value="0"/>
46+
<Sedation readOnly="false" value="0"/>
47+
<SystolicPressureModifier readOnly="false" value="0"/>
48+
<TidalVolumeModifier readOnly="false" value="0"/>
49+
<TubularPermeabilityModifier readOnly="false" value="0"/>
50+
<CentralNervousModifier readOnly="false" value="0"/>
51+
<AntibacterialEffect readOnly="false" unit="1/hr" value="0"/>
52+
<EffectSiteRateConstant readOnly="false" unit="1/min" value="0"/>
53+
</Pharmacodynamics>
5454
</Substance>
55-

‎share/data/substances/Albuterol.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@
8989
<DiastolicPressureModifier readOnly="false" value="0"/>
9090
<EC50 readOnly="false" unit="ug/mL" value="3.1e-05"/>
9191
<EMaxShapeParameter readOnly="false" value="1"/>
92-
<FeverModifier readOnly="false" value="0"/>
92+
<FeverModifier readOnly="false" value="0"/>
9393
<HeartRateModifier readOnly="false" value="0.3"/>
9494
<HemorrhageModifier readOnly="false" value="0"/>
9595
<NeuromuscularBlock readOnly="false" value="0"/>
96-
<PainModifier readOnly="false" value="0"/>
96+
<PainModifier readOnly="false" value="0"/>
9797
<PupillaryResponse>
9898
<ReactivityModifier readOnly="false" value="-0.5"/>
9999
<SizeModifier readOnly="false" value="0.5"/>

‎share/data/substances/Antigen_A.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<Name>Antigen_A</Name>
44
<Classification>WholeBlood</Classification>
55
<MolarMass readOnly="false" unit="g/mol" value="1212.013"/>
6+
<State>Molecular</State>
67
<Antigen>A</Antigen>
78
<Clearance>
89
<CellRegulation>

‎share/data/substances/Antigen_B.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<Name>Antigen_B</Name>
44
<Classification>WholeBlood</Classification>
55
<MolarMass readOnly="false" unit="g/mol" value="991.972"/>
6+
<State>Molecular</State>
67
<Antigen>B</Antigen>
78
<Clearance>
89
<CellRegulation>

‎share/data/substances/Blood_ANegative.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<Concentration readOnly="false" unit="g/L" value="0.023"/>
5050
</Component>
5151
<Component Name="Antigen_B">
52-
<Concentration readOnly="false" unit="g/L" value="0"/>
52+
<Concentration readOnly="false" unit="g/dL" value="0"/>
5353
</Component>
5454
<Component Name="WhiteBloodCell">
5555
<Concentration readOnly="false" unit="g/dL" value="0.0189"/>

‎share/data/substances/Blood_APositive.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<Concentration readOnly="false" unit="g/L" value="0.023"/>
5050
</Component>
5151
<Component Name="Antigen_B">
52-
<Concentration readOnly="false" unit="g/L" value="0"/>
52+
<Concentration readOnly="false" unit="g/dL" value="0"/>
5353
</Component>
5454
<Component Name="WhiteBloodCell">
5555
<Concentration readOnly="false" unit="g/dL" value="0.0189"/>

‎share/data/substances/Blood_BNegative.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<Concentration readOnly="false" unit="g/dL" value="14.256"/>
4747
</Component>
4848
<Component Name="Antigen_A">
49-
<Concentration readOnly="false" unit="g/L" value="0"/>
49+
<Concentration readOnly="false" unit="g/dL" value="0"/>
5050
</Component>
5151
<Component Name="Antigen_B">
5252
<Concentration readOnly="false" unit="g/L" value="0.019"/>

0 commit comments

Comments
 (0)