From a0d17a03741ec97d728eab46fd627f96cfd4a39e Mon Sep 17 00:00:00 2001 From: sdRDM Bot Date: Thu, 16 May 2024 17:54:54 +0000 Subject: [PATCH] API update --- pyThermoML/__init__.py | 2 +- .../core/activityfugacityosmoticprop.py | 8 +- pyThermoML/core/asymcombexpanduncert.py | 2 +- pyThermoML/core/asymcombstduncert.py | 2 +- pyThermoML/core/asymexpanduncert.py | 2 +- pyThermoML/core/asymstduncert.py | 2 +- pyThermoML/core/auxiliarysubstance.py | 4 +- pyThermoML/core/biomaterial.py | 2 +- pyThermoML/core/bioproperties.py | 8 +- pyThermoML/core/book.py | 2 +- pyThermoML/core/catalyst.py | 2 +- pyThermoML/core/citation.py | 10 +-- pyThermoML/core/combineduncertainty.py | 6 +- pyThermoML/core/component.py | 2 +- pyThermoML/core/componentsample.py | 2 +- .../core/compositionatphaseequilibrium.py | 8 +- pyThermoML/core/compound.py | 14 +-- pyThermoML/core/constraint.py | 10 +-- pyThermoML/core/constraintid.py | 2 +- pyThermoML/core/constraintphaseid.py | 6 +- pyThermoML/core/constrainttype.py | 10 +-- pyThermoML/core/constrdevicespec.py | 2 +- pyThermoML/core/constrrepeatability.py | 2 +- pyThermoML/core/construncertainty.py | 2 +- pyThermoML/core/covariance.py | 2 +- pyThermoML/core/criticalevaluation.py | 4 +- pyThermoML/core/criticals.py | 8 +- pyThermoML/core/curvedev.py | 2 +- pyThermoML/core/datareport.py | 87 +++++++++++-------- pyThermoML/core/eqconstant.py | 2 +- pyThermoML/core/eqconstraint.py | 2 +- pyThermoML/core/eqparameter.py | 2 +- pyThermoML/core/eqproperty.py | 2 +- pyThermoML/core/equation.py | 12 +-- pyThermoML/core/equationofstate.py | 12 +-- pyThermoML/core/eqvariable.py | 2 +- pyThermoML/core/evaleosref.py | 10 +-- pyThermoML/core/evalmultipropref.py | 10 +-- pyThermoML/core/evalsinglepropref.py | 10 +-- .../core/excesspartialapparentenergyprop.py | 8 +- pyThermoML/core/heatcapacityandderivedprop.py | 8 +- pyThermoML/core/ion.py | 2 +- pyThermoML/core/journal.py | 2 +- pyThermoML/core/multicomponentsubstance.py | 4 +- pyThermoML/core/multiprop.py | 12 +-- pyThermoML/core/numvalues.py | 10 +-- pyThermoML/core/participant.py | 6 +- pyThermoML/core/phaseid.py | 4 +- pyThermoML/core/phasetransition.py | 8 +- pyThermoML/core/polymer.py | 2 +- pyThermoML/core/prediction.py | 14 +-- pyThermoML/core/predictionmethodref.py | 10 +-- pyThermoML/core/propdevicespec.py | 2 +- pyThermoML/core/property.py | 32 +++---- pyThermoML/core/propertygroup.py | 18 ++-- pyThermoML/core/propertymethodid.py | 4 +- pyThermoML/core/propertyvalue.py | 14 +-- pyThermoML/core/proplimit.py | 2 +- pyThermoML/core/propphaseid.py | 8 +- pyThermoML/core/proprepeatability.py | 2 +- pyThermoML/core/propuncertainty.py | 4 +- pyThermoML/core/pureormixturedata.py | 76 ++++++++-------- pyThermoML/core/purity.py | 2 +- pyThermoML/core/reactiondata.py | 74 ++++++++-------- pyThermoML/core/reactionequilibriumprop.py | 8 +- pyThermoML/core/reactionstatechangeprop.py | 8 +- pyThermoML/core/refphaseid.py | 6 +- .../refractionsurfacetensionsoundspeed.py | 8 +- pyThermoML/core/regnum.py | 2 +- pyThermoML/core/sample.py | 8 +- pyThermoML/core/singleprop.py | 12 +-- pyThermoML/core/solvent.py | 2 +- pyThermoML/core/sorgid.py | 2 +- pyThermoML/core/thesis.py | 2 +- pyThermoML/core/transportprop.py | 8 +- pyThermoML/core/trcrefid.py | 2 +- .../core/vaporpboilingtazeotroptandp.py | 8 +- pyThermoML/core/vardevicespec.py | 2 +- pyThermoML/core/variable.py | 10 +-- pyThermoML/core/variableid.py | 2 +- pyThermoML/core/variabletype.py | 10 +-- pyThermoML/core/variablevalue.py | 2 +- pyThermoML/core/varphaseid.py | 4 +- pyThermoML/core/varrepeatability.py | 2 +- pyThermoML/core/varuncertainty.py | 2 +- pyThermoML/core/version.py | 2 +- pyThermoML/core/volumetricprop.py | 8 +- 87 files changed, 373 insertions(+), 354 deletions(-) diff --git a/pyThermoML/__init__.py b/pyThermoML/__init__.py index 104713b..47ee27e 100644 --- a/pyThermoML/__init__.py +++ b/pyThermoML/__init__.py @@ -1,3 +1,3 @@ __URL__ = "https://github.com/FAIRChemistry/pyThermoML" -__COMMIT__ = "decc3d7428f0517c8bc0428fd9785112138a62f6" +__COMMIT__ = "09a845c92b96665129bf0265d21674b8b92bf834" diff --git a/pyThermoML/core/activityfugacityosmoticprop.py b/pyThermoML/core/activityfugacityosmoticprop.py index 44008b8..2dd0409 100644 --- a/pyThermoML/core/activityfugacityosmoticprop.py +++ b/pyThermoML/core/activityfugacityosmoticprop.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class ActivityFugacityOsmoticProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/asymcombexpanduncert.py b/pyThermoML/core/asymcombexpanduncert.py index 69dc042..299c9a2 100644 --- a/pyThermoML/core/asymcombexpanduncert.py +++ b/pyThermoML/core/asymcombexpanduncert.py @@ -30,7 +30,7 @@ class AsymCombExpandUncert( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/asymcombstduncert.py b/pyThermoML/core/asymcombstduncert.py index e20d768..2de0465 100644 --- a/pyThermoML/core/asymcombstduncert.py +++ b/pyThermoML/core/asymcombstduncert.py @@ -30,7 +30,7 @@ class AsymCombStdUncert( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/asymexpanduncert.py b/pyThermoML/core/asymexpanduncert.py index ed27c5e..3f5bddf 100644 --- a/pyThermoML/core/asymexpanduncert.py +++ b/pyThermoML/core/asymexpanduncert.py @@ -30,7 +30,7 @@ class AsymExpandUncert( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/asymstduncert.py b/pyThermoML/core/asymstduncert.py index bf6f4e8..f7777aa 100644 --- a/pyThermoML/core/asymstduncert.py +++ b/pyThermoML/core/asymstduncert.py @@ -30,7 +30,7 @@ class AsymStdUncert( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/auxiliarysubstance.py b/pyThermoML/core/auxiliarysubstance.py index 6b5c3f6..d623ee8 100644 --- a/pyThermoML/core/auxiliarysubstance.py +++ b/pyThermoML/core/auxiliarysubstance.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .efunction import eFunction from .ephase import ePhase +from .efunction import eFunction from .regnum import RegNum @@ -45,7 +45,7 @@ class AuxiliarySubstance( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/biomaterial.py b/pyThermoML/core/biomaterial.py index 5a21b48..c926d0e 100644 --- a/pyThermoML/core/biomaterial.py +++ b/pyThermoML/core/biomaterial.py @@ -30,7 +30,7 @@ class Biomaterial( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/bioproperties.py b/pyThermoML/core/bioproperties.py index 1f55aaa..e4a2efa 100644 --- a/pyThermoML/core/bioproperties.py +++ b/pyThermoML/core/bioproperties.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class BioProperties( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/book.py b/pyThermoML/core/book.py index ed5b351..5656489 100644 --- a/pyThermoML/core/book.py +++ b/pyThermoML/core/book.py @@ -58,7 +58,7 @@ class Book( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/catalyst.py b/pyThermoML/core/catalyst.py index a51bd31..890c296 100644 --- a/pyThermoML/core/catalyst.py +++ b/pyThermoML/core/catalyst.py @@ -35,7 +35,7 @@ class Catalyst( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/citation.py b/pyThermoML/core/citation.py index 74f7a6a..6d05668 100644 --- a/pyThermoML/core/citation.py +++ b/pyThermoML/core/citation.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etype import eType -from .elanguage import eLanguage -from .thesis import Thesis -from .esourcetype import eSourceType from .trcrefid import TRCRefID +from .thesis import Thesis from .book import Book from .journal import Journal +from .elanguage import eLanguage +from .etype import eType +from .esourcetype import eSourceType @forge_signature @@ -167,7 +167,7 @@ class Citation( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/combineduncertainty.py b/pyThermoML/core/combineduncertainty.py index b51f685..62b3d03 100644 --- a/pyThermoML/core/combineduncertainty.py +++ b/pyThermoML/core/combineduncertainty.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .asymcombstduncert import AsymCombStdUncert -from .asymcombexpanduncert import AsymCombExpandUncert from .ecombuncertevalmethod import eCombUncertEvalMethod +from .asymcombexpanduncert import AsymCombExpandUncert +from .asymcombstduncert import AsymCombStdUncert @forge_signature @@ -77,7 +77,7 @@ class CombinedUncertainty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/component.py b/pyThermoML/core/component.py index 13a03fa..5ccddd3 100644 --- a/pyThermoML/core/component.py +++ b/pyThermoML/core/component.py @@ -37,7 +37,7 @@ class Component( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/componentsample.py b/pyThermoML/core/componentsample.py index 585fb42..3f64571 100644 --- a/pyThermoML/core/componentsample.py +++ b/pyThermoML/core/componentsample.py @@ -34,7 +34,7 @@ class ComponentSample( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/compositionatphaseequilibrium.py b/pyThermoML/core/compositionatphaseequilibrium.py index 15d1d55..9f6f50c 100644 --- a/pyThermoML/core/compositionatphaseequilibrium.py +++ b/pyThermoML/core/compositionatphaseequilibrium.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class CompositionAtPhaseEquilibrium( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/compound.py b/pyThermoML/core/compound.py index 9e8daf1..549f3ea 100644 --- a/pyThermoML/core/compound.py +++ b/pyThermoML/core/compound.py @@ -7,18 +7,18 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .esource import eSource -from .purity import Purity +from .componentsample import ComponentSample +from .polymer import Polymer from .estatus import eStatus +from .especiationstate import eSpeciationState from .sorgid import SOrgID +from .esource import eSource from .sample import Sample from .regnum import RegNum -from .especiationstate import eSpeciationState -from .componentsample import ComponentSample +from .biomaterial import Biomaterial +from .purity import Purity from .ion import Ion -from .polymer import Polymer from .multicomponentsubstance import MulticomponentSubstance -from .biomaterial import Biomaterial @forge_signature @@ -128,7 +128,7 @@ class Compound( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constraint.py b/pyThermoML/core/constraint.py index 1d907f7..af97007 100644 --- a/pyThermoML/core/constraint.py +++ b/pyThermoML/core/constraint.py @@ -7,12 +7,12 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .constrrepeatability import ConstrRepeatability -from .constraintid import ConstraintID -from .constraintphaseid import ConstraintPhaseID -from .construncertainty import ConstrUncertainty from .constrdevicespec import ConstrDeviceSpec from .solvent import Solvent +from .constraintphaseid import ConstraintPhaseID +from .construncertainty import ConstrUncertainty +from .constraintid import ConstraintID +from .constrrepeatability import ConstrRepeatability @forge_signature @@ -74,7 +74,7 @@ class Constraint( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constraintid.py b/pyThermoML/core/constraintid.py index 6a963e0..028bf07 100644 --- a/pyThermoML/core/constraintid.py +++ b/pyThermoML/core/constraintid.py @@ -37,7 +37,7 @@ class ConstraintID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constraintphaseid.py b/pyThermoML/core/constraintphaseid.py index 4e3af9e..3a19357 100644 --- a/pyThermoML/core/constraintphaseid.py +++ b/pyThermoML/core/constraintphaseid.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .econstraintphase import eConstraintPhase -from .regnum import RegNum from .ecrystallatticetype import eCrystalLatticeType +from .regnum import RegNum +from .econstraintphase import eConstraintPhase @forge_signature @@ -48,7 +48,7 @@ class ConstraintPhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constrainttype.py b/pyThermoML/core/constrainttype.py index 251cfaa..df8689d 100644 --- a/pyThermoML/core/constrainttype.py +++ b/pyThermoML/core/constrainttype.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etemperature import eTemperature +from .ebiovariables import eBioVariables from .esolventcomposition import eSolventComposition -from .eparticipantamount import eParticipantAmount from .emiscellaneous import eMiscellaneous -from .ecomponentcomposition import eComponentComposition -from .ebiovariables import eBioVariables +from .etemperature import eTemperature from .epressure import ePressure +from .eparticipantamount import eParticipantAmount +from .ecomponentcomposition import eComponentComposition @forge_signature @@ -58,7 +58,7 @@ class ConstraintType( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constrdevicespec.py b/pyThermoML/core/constrdevicespec.py index 05a36a6..7c0df51 100644 --- a/pyThermoML/core/constrdevicespec.py +++ b/pyThermoML/core/constrdevicespec.py @@ -50,7 +50,7 @@ class ConstrDeviceSpec( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/constrrepeatability.py b/pyThermoML/core/constrrepeatability.py index cdc4b0e..935bc66 100644 --- a/pyThermoML/core/constrrepeatability.py +++ b/pyThermoML/core/constrrepeatability.py @@ -42,7 +42,7 @@ class ConstrRepeatability( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/construncertainty.py b/pyThermoML/core/construncertainty.py index d20282f..7d40cb7 100644 --- a/pyThermoML/core/construncertainty.py +++ b/pyThermoML/core/construncertainty.py @@ -54,7 +54,7 @@ class ConstrUncertainty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/covariance.py b/pyThermoML/core/covariance.py index 4ce1f4c..1c639ab 100644 --- a/pyThermoML/core/covariance.py +++ b/pyThermoML/core/covariance.py @@ -35,7 +35,7 @@ class Covariance( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/criticalevaluation.py b/pyThermoML/core/criticalevaluation.py index 44d055e..c6e33a7 100644 --- a/pyThermoML/core/criticalevaluation.py +++ b/pyThermoML/core/criticalevaluation.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .equationofstate import EquationOfState from .singleprop import SingleProp +from .equationofstate import EquationOfState from .multiprop import MultiProp @@ -42,7 +42,7 @@ class CriticalEvaluation( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/criticals.py b/pyThermoML/core/criticals.py index 04e66cf..05504ef 100644 --- a/pyThermoML/core/criticals.py +++ b/pyThermoML/core/criticals.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class Criticals( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/curvedev.py b/pyThermoML/core/curvedev.py index 56fabdb..97e8591 100644 --- a/pyThermoML/core/curvedev.py +++ b/pyThermoML/core/curvedev.py @@ -50,7 +50,7 @@ class CurveDev( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/datareport.py b/pyThermoML/core/datareport.py index 977f169..c448627 100644 --- a/pyThermoML/core/datareport.py +++ b/pyThermoML/core/datareport.py @@ -10,35 +10,35 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .polymer import Polymer -from .participant import Participant -from .sorgid import SOrgID -from .reactiondata import ReactionData -from .property import Property -from .regnum import RegNum -from .combineduncertainty import CombinedUncertainty -from .ereactionformalism import eReactionFormalism +from .component import Component +from .solvent import Solvent +from .sample import Sample +from .citation import Citation from .version import Version -from .multicomponentsubstance import MulticomponentSubstance +from .sorgid import SOrgID from .numvalues import NumValues -from .sample import Sample -from .especiationstate import eSpeciationState -from .solvent import Solvent -from .eexppurpose import eExpPurpose -from .equation import Equation +from .multicomponentsubstance import MulticomponentSubstance from .constraint import Constraint +from .eexppurpose import eExpPurpose +from .regnum import RegNum +from .polymer import Polymer +from .reactiondata import ReactionData +from .especiationstate import eSpeciationState +from .compound import Compound from .biomaterial import Biomaterial -from .citation import Citation -from .phaseid import PhaseID -from .variable import Variable -from .auxiliarysubstance import AuxiliarySubstance +from .combineduncertainty import CombinedUncertainty from .pureormixturedata import PureOrMixtureData -from .compound import Compound +from .auxiliarysubstance import AuxiliarySubstance +from .variable import Variable +from .participant import Participant from .propertymethodid import PropertyMethodID -from .component import Component +from .property import Property +from .phaseid import PhaseID +from .ereactiontype import eReactionType from .propphaseid import PropPhaseID +from .equation import Equation +from .ereactionformalism import eReactionFormalism from .ion import Ion -from .ereactiontype import eReactionType from ..tools.mapping import ( CONTSTRAINT_IDS, VARIABLES_IDS, @@ -87,7 +87,7 @@ class DataReport( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) @@ -415,10 +415,15 @@ def get_property_list(self, verbose: bool = False): property_list = sorted({ ( - pomd.property_name()["type"] + - (f' of {id_dict[pomd.property_name()["component_identifier"].n_org_num][0]}' if pomd.property_name()["component_identifier"].n_org_num else "") + pomd.property_name()["type"] + + ( + " of" + f" {id_dict[pomd.property_name()['component_identifier'].n_org_num][0]}" + if pomd.property_name()["component_identifier"].n_org_num + else "" + ) ) - for pomd in self.pure_or_mixture_data + for pomd in self.pure_or_mixture_data }) if verbose: @@ -453,8 +458,12 @@ def get_all_data(self, verbose: bool = True): [ ( ( - property_dict["type"] + - (f' of {id_dict[property_dict["component_identifier"].n_org_num][0]}' if property_dict["component_identifier"].n_org_num else "") + property_dict["type"] + + ( + f' of {id_dict[property_dict["component_identifier"].n_org_num][0]}' + if property_dict["component_identifier"].n_org_num + else "" + ) ), "mean", ), @@ -462,20 +471,30 @@ def get_all_data(self, verbose: bool = True): ] + [ ( - "variable", + "variable", ( - var["type"] + - (f' of {id_dict[var["component_identifier"].n_org_num][0]}' if var["component_identifier"].n_org_num else "") + var["type"] + + ( + " of" + f" {id_dict[var['component_identifier'].n_org_num][0]}" + if var["component_identifier"].n_org_num + else "" + ) ), - ) - for var in variables + ) + for var in variables ] + [ ( "constraint", ( - const["type"] + - (f' of {id_dict[const["component_identifier"].n_org_num][0]}' if const["component_identifier"].n_org_num else "") + const["type"] + + ( + " of" + f" {id_dict[const['component_identifier'].n_org_num][0]}" + if const["component_identifier"].n_org_num + else "" + ) ), ) for const in constraints diff --git a/pyThermoML/core/eqconstant.py b/pyThermoML/core/eqconstant.py index e80a297..9956fde 100644 --- a/pyThermoML/core/eqconstant.py +++ b/pyThermoML/core/eqconstant.py @@ -44,7 +44,7 @@ class EqConstant( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/eqconstraint.py b/pyThermoML/core/eqconstraint.py index 591fb4d..a936a7f 100644 --- a/pyThermoML/core/eqconstraint.py +++ b/pyThermoML/core/eqconstraint.py @@ -62,7 +62,7 @@ class EqConstraint( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/eqparameter.py b/pyThermoML/core/eqparameter.py index 8693e68..8e30b87 100644 --- a/pyThermoML/core/eqparameter.py +++ b/pyThermoML/core/eqparameter.py @@ -41,7 +41,7 @@ class EqParameter( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/eqproperty.py b/pyThermoML/core/eqproperty.py index 70dc232..692954f 100644 --- a/pyThermoML/core/eqproperty.py +++ b/pyThermoML/core/eqproperty.py @@ -58,7 +58,7 @@ class EqProperty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/equation.py b/pyThermoML/core/equation.py index cc595a0..e3aee04 100644 --- a/pyThermoML/core/equation.py +++ b/pyThermoML/core/equation.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .eqparameter import EqParameter -from .eqvariable import EqVariable -from .eqconstant import EqConstant +from .eeqname import eEqName from .eqproperty import EqProperty -from .eqconstraint import EqConstraint from .covariance import Covariance -from .eeqname import eEqName +from .eqvariable import EqVariable +from .eqparameter import EqParameter +from .eqconstraint import EqConstraint +from .eqconstant import EqConstant @forge_signature @@ -75,7 +75,7 @@ class Equation( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/equationofstate.py b/pyThermoML/core/equationofstate.py index 8ba227e..606b88f 100644 --- a/pyThermoML/core/equationofstate.py +++ b/pyThermoML/core/equationofstate.py @@ -7,14 +7,14 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etype import eType -from .elanguage import eLanguage -from .thesis import Thesis -from .esourcetype import eSourceType from .trcrefid import TRCRefID -from .evaleosref import EvalEOSRef +from .thesis import Thesis from .book import Book from .journal import Journal +from .elanguage import eLanguage +from .etype import eType +from .esourcetype import eSourceType +from .evaleosref import EvalEOSRef @forge_signature @@ -45,7 +45,7 @@ class EquationOfState( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/eqvariable.py b/pyThermoML/core/eqvariable.py index 4d8f9ec..4b2ea30 100644 --- a/pyThermoML/core/eqvariable.py +++ b/pyThermoML/core/eqvariable.py @@ -54,7 +54,7 @@ class EqVariable( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/evaleosref.py b/pyThermoML/core/evaleosref.py index 3fef0ba..00ba511 100644 --- a/pyThermoML/core/evaleosref.py +++ b/pyThermoML/core/evaleosref.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etype import eType -from .elanguage import eLanguage -from .thesis import Thesis -from .esourcetype import eSourceType from .trcrefid import TRCRefID +from .thesis import Thesis from .book import Book from .journal import Journal +from .elanguage import eLanguage +from .etype import eType +from .esourcetype import eSourceType @forge_signature @@ -167,7 +167,7 @@ class EvalEOSRef( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/evalmultipropref.py b/pyThermoML/core/evalmultipropref.py index fc104b6..5d5792a 100644 --- a/pyThermoML/core/evalmultipropref.py +++ b/pyThermoML/core/evalmultipropref.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etype import eType -from .elanguage import eLanguage -from .thesis import Thesis -from .esourcetype import eSourceType from .trcrefid import TRCRefID +from .thesis import Thesis from .book import Book from .journal import Journal +from .elanguage import eLanguage +from .etype import eType +from .esourcetype import eSourceType @forge_signature @@ -167,7 +167,7 @@ class EvalMultiPropRef( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/evalsinglepropref.py b/pyThermoML/core/evalsinglepropref.py index 9d601aa..f92e5eb 100644 --- a/pyThermoML/core/evalsinglepropref.py +++ b/pyThermoML/core/evalsinglepropref.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etype import eType -from .elanguage import eLanguage -from .thesis import Thesis -from .esourcetype import eSourceType from .trcrefid import TRCRefID +from .thesis import Thesis from .book import Book from .journal import Journal +from .elanguage import eLanguage +from .etype import eType +from .esourcetype import eSourceType @forge_signature @@ -167,7 +167,7 @@ class EvalSinglePropRef( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/excesspartialapparentenergyprop.py b/pyThermoML/core/excesspartialapparentenergyprop.py index a44fe22..d529624 100644 --- a/pyThermoML/core/excesspartialapparentenergyprop.py +++ b/pyThermoML/core/excesspartialapparentenergyprop.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class ExcessPartialApparentEnergyProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/heatcapacityandderivedprop.py b/pyThermoML/core/heatcapacityandderivedprop.py index 0eb3430..200111b 100644 --- a/pyThermoML/core/heatcapacityandderivedprop.py +++ b/pyThermoML/core/heatcapacityandderivedprop.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class HeatCapacityAndDerivedProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/ion.py b/pyThermoML/core/ion.py index b7b2964..a69d8d2 100644 --- a/pyThermoML/core/ion.py +++ b/pyThermoML/core/ion.py @@ -27,7 +27,7 @@ class Ion( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/journal.py b/pyThermoML/core/journal.py index 1709e39..e30b245 100644 --- a/pyThermoML/core/journal.py +++ b/pyThermoML/core/journal.py @@ -44,7 +44,7 @@ class Journal( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/multicomponentsubstance.py b/pyThermoML/core/multicomponentsubstance.py index 17e7f5d..2dda25f 100644 --- a/pyThermoML/core/multicomponentsubstance.py +++ b/pyThermoML/core/multicomponentsubstance.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .regnum import RegNum from .component import Component +from .regnum import RegNum @forge_signature @@ -39,7 +39,7 @@ class MulticomponentSubstance( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/multiprop.py b/pyThermoML/core/multiprop.py index 0aae5e5..891dd57 100644 --- a/pyThermoML/core/multiprop.py +++ b/pyThermoML/core/multiprop.py @@ -7,14 +7,14 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etype import eType -from .evalmultipropref import EvalMultiPropRef -from .elanguage import eLanguage -from .thesis import Thesis -from .esourcetype import eSourceType from .trcrefid import TRCRefID +from .thesis import Thesis from .book import Book from .journal import Journal +from .elanguage import eLanguage +from .etype import eType +from .esourcetype import eSourceType +from .evalmultipropref import EvalMultiPropRef @forge_signature @@ -47,7 +47,7 @@ class MultiProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/numvalues.py b/pyThermoML/core/numvalues.py index 0e5749a..953241c 100644 --- a/pyThermoML/core/numvalues.py +++ b/pyThermoML/core/numvalues.py @@ -7,15 +7,15 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .curvedev import CurveDev -from .variablevalue import VariableValue +from .varuncertainty import VarUncertainty from .combineduncertainty import CombinedUncertainty -from .proprepeatability import PropRepeatability from .propertyvalue import PropertyValue +from .curvedev import CurveDev from .propuncertainty import PropUncertainty from .varrepeatability import VarRepeatability -from .varuncertainty import VarUncertainty +from .variablevalue import VariableValue from .proplimit import PropLimit +from .proprepeatability import PropRepeatability @forge_signature @@ -43,7 +43,7 @@ class NumValues( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/participant.py b/pyThermoML/core/participant.py index 3bf20cc..24e4daf 100644 --- a/pyThermoML/core/participant.py +++ b/pyThermoML/core/participant.py @@ -8,10 +8,10 @@ from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict from .ephase import ePhase -from .estandardstate import eStandardState from .ecompositionrepresentation import eCompositionRepresentation -from .regnum import RegNum from .ecrystallatticetype import eCrystalLatticeType +from .regnum import RegNum +from .estandardstate import eStandardState @forge_signature @@ -71,7 +71,7 @@ class Participant( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/phaseid.py b/pyThermoML/core/phaseid.py index 2bc4c29..d659495 100644 --- a/pyThermoML/core/phaseid.py +++ b/pyThermoML/core/phaseid.py @@ -8,8 +8,8 @@ from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict from .ephase import ePhase -from .regnum import RegNum from .ecrystallatticetype import eCrystalLatticeType +from .regnum import RegNum @forge_signature @@ -46,7 +46,7 @@ class PhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/phasetransition.py b/pyThermoML/core/phasetransition.py index ac5d19e..2310804 100644 --- a/pyThermoML/core/phasetransition.py +++ b/pyThermoML/core/phasetransition.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class PhaseTransition( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/polymer.py b/pyThermoML/core/polymer.py index f7a1aba..8b47330 100644 --- a/pyThermoML/core/polymer.py +++ b/pyThermoML/core/polymer.py @@ -69,7 +69,7 @@ class Polymer( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/prediction.py b/pyThermoML/core/prediction.py index 20ddfce..1790bbd 100644 --- a/pyThermoML/core/prediction.py +++ b/pyThermoML/core/prediction.py @@ -7,15 +7,15 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etype import eType -from .elanguage import eLanguage -from .predictionmethodref import PredictionMethodRef -from .thesis import Thesis -from .esourcetype import eSourceType +from .epredictiontype import ePredictionType from .trcrefid import TRCRefID +from .thesis import Thesis from .book import Book from .journal import Journal -from .epredictiontype import ePredictionType +from .elanguage import eLanguage +from .etype import eType +from .esourcetype import eSourceType +from .predictionmethodref import PredictionMethodRef @forge_signature @@ -53,7 +53,7 @@ class Prediction( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/predictionmethodref.py b/pyThermoML/core/predictionmethodref.py index 9700f6e..312b083 100644 --- a/pyThermoML/core/predictionmethodref.py +++ b/pyThermoML/core/predictionmethodref.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etype import eType -from .elanguage import eLanguage -from .thesis import Thesis -from .esourcetype import eSourceType from .trcrefid import TRCRefID +from .thesis import Thesis from .book import Book from .journal import Journal +from .elanguage import eLanguage +from .etype import eType +from .esourcetype import eSourceType @forge_signature @@ -167,7 +167,7 @@ class PredictionMethodRef( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propdevicespec.py b/pyThermoML/core/propdevicespec.py index 6343c04..d2866a8 100644 --- a/pyThermoML/core/propdevicespec.py +++ b/pyThermoML/core/propdevicespec.py @@ -45,7 +45,7 @@ class PropDeviceSpec( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/property.py b/pyThermoML/core/property.py index 23c0b7b..8335a9d 100644 --- a/pyThermoML/core/property.py +++ b/pyThermoML/core/property.py @@ -7,29 +7,29 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .asymcombexpanduncert import AsymCombExpandUncert -from .ecrystallatticetype import eCrystalLatticeType -from .refphaseid import RefPhaseID -from .epresentation import ePresentation from .ecombuncertevalmethod import eCombUncertEvalMethod +from .ephase import ePhase from .propertymethodid import PropertyMethodID -from .curvedev import CurveDev +from .solvent import Solvent +from .epresentation import ePresentation +from .catalyst import Catalyst +from .proprepeatability import PropRepeatability +from .propuncertainty import PropUncertainty +from .propphaseid import PropPhaseID from .combineduncertainty import CombinedUncertainty +from .refphaseid import RefPhaseID +from .asymcombexpanduncert import AsymCombExpandUncert from .asymcombstduncert import AsymCombStdUncert +from .propdevicespec import PropDeviceSpec +from .curvedev import CurveDev +from .ecrystallatticetype import eCrystalLatticeType +from .asymexpanduncert import AsymExpandUncert from .estandardstate import eStandardState -from .propuncertainty import PropUncertainty -from .erefstatetype import eRefStateType +from .ebiostate import eBioState from .epropphase import ePropPhase -from .catalyst import Catalyst -from .propdevicespec import PropDeviceSpec -from .ephase import ePhase -from .proprepeatability import PropRepeatability -from .propphaseid import PropPhaseID from .asymstduncert import AsymStdUncert -from .ebiostate import eBioState from .regnum import RegNum -from .asymexpanduncert import AsymExpandUncert -from .solvent import Solvent +from .erefstatetype import eRefStateType @forge_signature @@ -143,7 +143,7 @@ class Property( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propertygroup.py b/pyThermoML/core/propertygroup.py index 0b8772f..a730741 100644 --- a/pyThermoML/core/propertygroup.py +++ b/pyThermoML/core/propertygroup.py @@ -7,19 +7,19 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict +from .reactionstatechangeprop import ReactionStateChangeProp +from .volumetricprop import VolumetricProp +from .criticals import Criticals +from .activityfugacityosmoticprop import ActivityFugacityOsmoticProp +from .compositionatphaseequilibrium import CompositionAtPhaseEquilibrium +from .excesspartialapparentenergyprop import ExcessPartialApparentEnergyProp from .vaporpboilingtazeotroptandp import VaporPBoilingTAzeotropTandP +from .refractionsurfacetensionsoundspeed import RefractionSurfaceTensionSoundSpeed from .reactionequilibriumprop import ReactionEquilibriumProp -from .excesspartialapparentenergyprop import ExcessPartialApparentEnergyProp -from .bioproperties import BioProperties from .heatcapacityandderivedprop import HeatCapacityAndDerivedProp +from .bioproperties import BioProperties from .transportprop import TransportProp from .phasetransition import PhaseTransition -from .criticals import Criticals -from .activityfugacityosmoticprop import ActivityFugacityOsmoticProp -from .compositionatphaseequilibrium import CompositionAtPhaseEquilibrium -from .refractionsurfacetensionsoundspeed import RefractionSurfaceTensionSoundSpeed -from .reactionstatechangeprop import ReactionStateChangeProp -from .volumetricprop import VolumetricProp @forge_signature @@ -106,7 +106,7 @@ class PropertyGroup( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propertymethodid.py b/pyThermoML/core/propertymethodid.py index 375752d..b8b15ae 100644 --- a/pyThermoML/core/propertymethodid.py +++ b/pyThermoML/core/propertymethodid.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .regnum import RegNum from .propertygroup import PropertyGroup +from .regnum import RegNum @forge_signature @@ -37,7 +37,7 @@ class PropertyMethodID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propertyvalue.py b/pyThermoML/core/propertyvalue.py index 92d4f37..af799f1 100644 --- a/pyThermoML/core/propertyvalue.py +++ b/pyThermoML/core/propertyvalue.py @@ -7,16 +7,16 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .curvedev import CurveDev +from .ecombuncertevalmethod import eCombUncertEvalMethod from .combineduncertainty import CombinedUncertainty -from .asymcombstduncert import AsymCombStdUncert -from .asymcombexpanduncert import AsymCombExpandUncert -from .proprepeatability import PropRepeatability -from .asymexpanduncert import AsymExpandUncert +from .curvedev import CurveDev from .propuncertainty import PropUncertainty -from .ecombuncertevalmethod import eCombUncertEvalMethod from .asymstduncert import AsymStdUncert +from .asymcombexpanduncert import AsymCombExpandUncert +from .asymcombstduncert import AsymCombStdUncert +from .asymexpanduncert import AsymExpandUncert from .proplimit import PropLimit +from .proprepeatability import PropRepeatability @forge_signature @@ -73,7 +73,7 @@ class PropertyValue( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/proplimit.py b/pyThermoML/core/proplimit.py index 321a282..3798a92 100644 --- a/pyThermoML/core/proplimit.py +++ b/pyThermoML/core/proplimit.py @@ -39,7 +39,7 @@ class PropLimit( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propphaseid.py b/pyThermoML/core/propphaseid.py index b4d2c68..05ff869 100644 --- a/pyThermoML/core/propphaseid.py +++ b/pyThermoML/core/propphaseid.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .ebiostate import eBioState -from .regnum import RegNum -from .ecrystallatticetype import eCrystalLatticeType from .epropphase import ePropPhase +from .ecrystallatticetype import eCrystalLatticeType +from .regnum import RegNum +from .ebiostate import eBioState @forge_signature @@ -53,7 +53,7 @@ class PropPhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/proprepeatability.py b/pyThermoML/core/proprepeatability.py index 8b79126..01af638 100644 --- a/pyThermoML/core/proprepeatability.py +++ b/pyThermoML/core/proprepeatability.py @@ -44,7 +44,7 @@ class PropRepeatability( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/propuncertainty.py b/pyThermoML/core/propuncertainty.py index 4f23525..06a7dfd 100644 --- a/pyThermoML/core/propuncertainty.py +++ b/pyThermoML/core/propuncertainty.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .asymexpanduncert import AsymExpandUncert from .asymstduncert import AsymStdUncert +from .asymexpanduncert import AsymExpandUncert @forge_signature @@ -71,7 +71,7 @@ class PropUncertainty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/pureormixturedata.py b/pyThermoML/core/pureormixturedata.py index fc3aa5e..1fb73af 100644 --- a/pyThermoML/core/pureormixturedata.py +++ b/pyThermoML/core/pureormixturedata.py @@ -8,51 +8,51 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .refphaseid import RefPhaseID -from .constraintphaseid import ConstraintPhaseID -from .property import Property -from .propdevicespec import PropDeviceSpec -from .variableid import VariableID -from .eqconstraint import EqConstraint -from .regnum import RegNum -from .eeqname import eEqName -from .constraintid import ConstraintID -from .eqproperty import EqProperty +from .component import Component +from .solvent import Solvent from .epresentation import ePresentation -from .efunction import eFunction -from .combineduncertainty import CombinedUncertainty -from .estandardstate import eStandardState from .proprepeatability import PropRepeatability +from .eqconstraint import EqConstraint +from .propdevicespec import PropDeviceSpec +from .curvedev import CurveDev +from .variableid import VariableID from .numvalues import NumValues -from .construncertainty import ConstrUncertainty -from .eqvariable import EqVariable -from .solvent import Solvent -from .eexppurpose import eExpPurpose -from .equation import Equation -from .constrrepeatability import ConstrRepeatability from .constraint import Constraint -from .ecrystallatticetype import eCrystalLatticeType -from .propertyvalue import PropertyValue -from .propuncertainty import PropUncertainty +from .eexppurpose import eExpPurpose +from .regnum import RegNum from .erefstatetype import eRefStateType -from .catalyst import Catalyst -from .phaseid import PhaseID -from .variable import Variable -from .auxiliarysubstance import AuxiliarySubstance -from .varrepeatability import VarRepeatability -from .vardevicespec import VarDeviceSpec +from .ephase import ePhase from .constrdevicespec import ConstrDeviceSpec -from .eqparameter import EqParameter -from .varuncertainty import VarUncertainty +from .eqconstant import EqConstant +from .propuncertainty import PropUncertainty +from .combineduncertainty import CombinedUncertainty +from .eeqname import eEqName from .covariance import Covariance +from .propertyvalue import PropertyValue +from .auxiliarysubstance import AuxiliarySubstance +from .eqparameter import EqParameter +from .ecrystallatticetype import eCrystalLatticeType +from .variable import Variable +from .estandardstate import eStandardState +from .eqproperty import EqProperty from .propertymethodid import PropertyMethodID -from .curvedev import CurveDev -from .component import Component -from .ephase import ePhase -from .propphaseid import PropPhaseID -from .variablevalue import VariableValue -from .eqconstant import EqConstant +from .property import Property +from .phaseid import PhaseID from .varphaseid import VarPhaseID +from .vardevicespec import VarDeviceSpec +from .constraintid import ConstraintID +from .varuncertainty import VarUncertainty +from .eqvariable import EqVariable +from .varrepeatability import VarRepeatability +from .variablevalue import VariableValue +from .constraintphaseid import ConstraintPhaseID +from .catalyst import Catalyst +from .propphaseid import PropPhaseID +from .refphaseid import RefPhaseID +from .efunction import eFunction +from .construncertainty import ConstrUncertainty +from .equation import Equation +from .constrrepeatability import ConstrRepeatability @forge_signature @@ -133,7 +133,7 @@ class PureOrMixtureData( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) @@ -1077,7 +1077,7 @@ def get_constraints(self): "type": "Mole fraction", "component_identifier": self.component[0].reg_num, "phase": self.phase_id[0].e_phase, - "value": 1.0 + "value": 1.0, } constraints.append(constraint) diff --git a/pyThermoML/core/purity.py b/pyThermoML/core/purity.py index 369da8a..eff2e2b 100644 --- a/pyThermoML/core/purity.py +++ b/pyThermoML/core/purity.py @@ -146,7 +146,7 @@ class Purity( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/reactiondata.py b/pyThermoML/core/reactiondata.py index 3963bfc..eeb1b52 100644 --- a/pyThermoML/core/reactiondata.py +++ b/pyThermoML/core/reactiondata.py @@ -7,53 +7,53 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .refphaseid import RefPhaseID -from .constraintphaseid import ConstraintPhaseID -from .participant import Participant -from .property import Property +from .solvent import Solvent +from .epresentation import ePresentation +from .proprepeatability import PropRepeatability +from .eqconstraint import EqConstraint from .propdevicespec import PropDeviceSpec +from .curvedev import CurveDev from .variableid import VariableID -from .eqconstraint import EqConstraint +from .numvalues import NumValues +from .constraint import Constraint +from .eexppurpose import eExpPurpose from .regnum import RegNum -from .eeqname import eEqName -from .constraintid import ConstraintID -from .eqproperty import EqProperty -from .epresentation import ePresentation -from .efunction import eFunction +from .erefstatetype import eRefStateType +from .ephase import ePhase +from .constrdevicespec import ConstrDeviceSpec +from .eqconstant import EqConstant +from .propuncertainty import PropUncertainty from .combineduncertainty import CombinedUncertainty -from .ereactionformalism import eReactionFormalism -from .estandardstate import eStandardState +from .eeqname import eEqName from .ecompositionrepresentation import eCompositionRepresentation -from .proprepeatability import PropRepeatability -from .numvalues import NumValues -from .construncertainty import ConstrUncertainty -from .eqvariable import EqVariable -from .solvent import Solvent -from .eexppurpose import eExpPurpose -from .equation import Equation -from .constrrepeatability import ConstrRepeatability -from .constraint import Constraint -from .ecrystallatticetype import eCrystalLatticeType +from .covariance import Covariance from .propertyvalue import PropertyValue -from .propuncertainty import PropUncertainty -from .erefstatetype import eRefStateType -from .catalyst import Catalyst -from .variable import Variable from .auxiliarysubstance import AuxiliarySubstance -from .varrepeatability import VarRepeatability -from .vardevicespec import VarDeviceSpec -from .constrdevicespec import ConstrDeviceSpec from .eqparameter import EqParameter -from .varuncertainty import VarUncertainty -from .covariance import Covariance +from .ecrystallatticetype import eCrystalLatticeType +from .variable import Variable +from .estandardstate import eStandardState +from .participant import Participant +from .eqproperty import EqProperty from .propertymethodid import PropertyMethodID -from .curvedev import CurveDev -from .ephase import ePhase -from .propphaseid import PropPhaseID +from .property import Property from .ereactiontype import eReactionType -from .variablevalue import VariableValue -from .eqconstant import EqConstant from .varphaseid import VarPhaseID +from .vardevicespec import VarDeviceSpec +from .constraintid import ConstraintID +from .varuncertainty import VarUncertainty +from .eqvariable import EqVariable +from .varrepeatability import VarRepeatability +from .variablevalue import VariableValue +from .constraintphaseid import ConstraintPhaseID +from .catalyst import Catalyst +from .propphaseid import PropPhaseID +from .refphaseid import RefPhaseID +from .efunction import eFunction +from .construncertainty import ConstrUncertainty +from .equation import Equation +from .ereactionformalism import eReactionFormalism +from .constrrepeatability import ConstrRepeatability @forge_signature @@ -145,7 +145,7 @@ class ReactionData( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/reactionequilibriumprop.py b/pyThermoML/core/reactionequilibriumprop.py index 5db60b7..a0fad0c 100644 --- a/pyThermoML/core/reactionequilibriumprop.py +++ b/pyThermoML/core/reactionequilibriumprop.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -49,7 +49,7 @@ class ReactionEquilibriumProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/reactionstatechangeprop.py b/pyThermoML/core/reactionstatechangeprop.py index 5b9d126..5b697d9 100644 --- a/pyThermoML/core/reactionstatechangeprop.py +++ b/pyThermoML/core/reactionstatechangeprop.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -49,7 +49,7 @@ class ReactionStateChangeProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/refphaseid.py b/pyThermoML/core/refphaseid.py index 8e543e7..784011c 100644 --- a/pyThermoML/core/refphaseid.py +++ b/pyThermoML/core/refphaseid.py @@ -7,9 +7,9 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .regnum import RegNum -from .ecrystallatticetype import eCrystalLatticeType from .erefphase import eRefPhase +from .ecrystallatticetype import eCrystalLatticeType +from .regnum import RegNum @forge_signature @@ -46,7 +46,7 @@ class RefPhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/refractionsurfacetensionsoundspeed.py b/pyThermoML/core/refractionsurfacetensionsoundspeed.py index 04e0403..7c7d627 100644 --- a/pyThermoML/core/refractionsurfacetensionsoundspeed.py +++ b/pyThermoML/core/refractionsurfacetensionsoundspeed.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class RefractionSurfaceTensionSoundSpeed( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/regnum.py b/pyThermoML/core/regnum.py index 7119405..b3a36c8 100644 --- a/pyThermoML/core/regnum.py +++ b/pyThermoML/core/regnum.py @@ -33,7 +33,7 @@ class RegNum( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/sample.py b/pyThermoML/core/sample.py index 3e8b1b3..2abe142 100644 --- a/pyThermoML/core/sample.py +++ b/pyThermoML/core/sample.py @@ -8,11 +8,11 @@ from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict from .eanalmeth import eAnalMeth -from .esource import eSource -from .purity import Purity +from .componentsample import ComponentSample from .estatus import eStatus +from .esource import eSource from .regnum import RegNum -from .componentsample import ComponentSample +from .purity import Purity from .epurifmethod import ePurifMethod @@ -52,7 +52,7 @@ class Sample( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/singleprop.py b/pyThermoML/core/singleprop.py index 08ba963..f76e07a 100644 --- a/pyThermoML/core/singleprop.py +++ b/pyThermoML/core/singleprop.py @@ -7,14 +7,14 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etype import eType -from .elanguage import eLanguage -from .thesis import Thesis -from .esourcetype import eSourceType from .trcrefid import TRCRefID -from .evalsinglepropref import EvalSinglePropRef +from .thesis import Thesis from .book import Book from .journal import Journal +from .elanguage import eLanguage +from .evalsinglepropref import EvalSinglePropRef +from .etype import eType +from .esourcetype import eSourceType @forge_signature @@ -42,7 +42,7 @@ class SingleProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/solvent.py b/pyThermoML/core/solvent.py index ec9564e..c24c9c4 100644 --- a/pyThermoML/core/solvent.py +++ b/pyThermoML/core/solvent.py @@ -35,7 +35,7 @@ class Solvent( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/sorgid.py b/pyThermoML/core/sorgid.py index 6f507b2..8d6b77f 100644 --- a/pyThermoML/core/sorgid.py +++ b/pyThermoML/core/sorgid.py @@ -30,7 +30,7 @@ class SOrgID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/thesis.py b/pyThermoML/core/thesis.py index a0ca008..8bd2cb8 100644 --- a/pyThermoML/core/thesis.py +++ b/pyThermoML/core/thesis.py @@ -44,7 +44,7 @@ class Thesis( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/transportprop.py b/pyThermoML/core/transportprop.py index a2f4702..ed5b42c 100644 --- a/pyThermoML/core/transportprop.py +++ b/pyThermoML/core/transportprop.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class TransportProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/trcrefid.py b/pyThermoML/core/trcrefid.py index 421833e..b5ca9f3 100644 --- a/pyThermoML/core/trcrefid.py +++ b/pyThermoML/core/trcrefid.py @@ -51,7 +51,7 @@ class TRCRefID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/vaporpboilingtazeotroptandp.py b/pyThermoML/core/vaporpboilingtazeotroptandp.py index 71b3829..df68403 100644 --- a/pyThermoML/core/vaporpboilingtazeotroptandp.py +++ b/pyThermoML/core/vaporpboilingtazeotroptandp.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class VaporPBoilingTAzeotropTandP( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/vardevicespec.py b/pyThermoML/core/vardevicespec.py index 70a5093..2301961 100644 --- a/pyThermoML/core/vardevicespec.py +++ b/pyThermoML/core/vardevicespec.py @@ -45,7 +45,7 @@ class VarDeviceSpec( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/variable.py b/pyThermoML/core/variable.py index dba1642..63abb10 100644 --- a/pyThermoML/core/variable.py +++ b/pyThermoML/core/variable.py @@ -7,12 +7,12 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .varuncertainty import VarUncertainty +from .solvent import Solvent +from .varphaseid import VarPhaseID +from .vardevicespec import VarDeviceSpec from .variableid import VariableID +from .varuncertainty import VarUncertainty from .varrepeatability import VarRepeatability -from .vardevicespec import VarDeviceSpec -from .varphaseid import VarPhaseID -from .solvent import Solvent @forge_signature @@ -65,7 +65,7 @@ class Variable( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/variableid.py b/pyThermoML/core/variableid.py index 297a10a..985fed6 100644 --- a/pyThermoML/core/variableid.py +++ b/pyThermoML/core/variableid.py @@ -37,7 +37,7 @@ class VariableID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/variabletype.py b/pyThermoML/core/variabletype.py index c879779..6e52942 100644 --- a/pyThermoML/core/variabletype.py +++ b/pyThermoML/core/variabletype.py @@ -7,13 +7,13 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .etemperature import eTemperature +from .ebiovariables import eBioVariables from .esolventcomposition import eSolventComposition -from .eparticipantamount import eParticipantAmount from .emiscellaneous import eMiscellaneous -from .ecomponentcomposition import eComponentComposition -from .ebiovariables import eBioVariables +from .etemperature import eTemperature from .epressure import ePressure +from .eparticipantamount import eParticipantAmount +from .ecomponentcomposition import eComponentComposition @forge_signature @@ -58,7 +58,7 @@ class VariableType( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/variablevalue.py b/pyThermoML/core/variablevalue.py index b789b32..41f609d 100644 --- a/pyThermoML/core/variablevalue.py +++ b/pyThermoML/core/variablevalue.py @@ -50,7 +50,7 @@ class VariableValue( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/varphaseid.py b/pyThermoML/core/varphaseid.py index 00b0212..26b31e3 100644 --- a/pyThermoML/core/varphaseid.py +++ b/pyThermoML/core/varphaseid.py @@ -7,8 +7,8 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .regnum import RegNum from .ecrystallatticetype import eCrystalLatticeType +from .regnum import RegNum from .evarphase import eVarPhase @@ -46,7 +46,7 @@ class VarPhaseID( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/varrepeatability.py b/pyThermoML/core/varrepeatability.py index d6cc3bd..f586de9 100644 --- a/pyThermoML/core/varrepeatability.py +++ b/pyThermoML/core/varrepeatability.py @@ -44,7 +44,7 @@ class VarRepeatability( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/varuncertainty.py b/pyThermoML/core/varuncertainty.py index 2ed1c6e..e1cd722 100644 --- a/pyThermoML/core/varuncertainty.py +++ b/pyThermoML/core/varuncertainty.py @@ -59,7 +59,7 @@ class VarUncertainty( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/version.py b/pyThermoML/core/version.py index 411ac03..a5c0bc6 100644 --- a/pyThermoML/core/version.py +++ b/pyThermoML/core/version.py @@ -30,7 +30,7 @@ class Version( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict) diff --git a/pyThermoML/core/volumetricprop.py b/pyThermoML/core/volumetricprop.py index 2ec8854..b2baf06 100644 --- a/pyThermoML/core/volumetricprop.py +++ b/pyThermoML/core/volumetricprop.py @@ -7,10 +7,10 @@ from sdRDM.base.listplus import ListPlus from sdRDM.base.utils import forge_signature from sdRDM.tools.utils import elem2dict -from .prediction import Prediction -from .criticalevaluation import CriticalEvaluation -from .epropname import ePropName from .emethodname import eMethodName +from .epropname import ePropName +from .criticalevaluation import CriticalEvaluation +from .prediction import Prediction @forge_signature @@ -47,7 +47,7 @@ class VolumetricProp( default="https://github.com/FAIRChemistry/pyThermoML" ) _commit: Optional[str] = PrivateAttr( - default="decc3d7428f0517c8bc0428fd9785112138a62f6" + default="09a845c92b96665129bf0265d21674b8b92bf834" ) _raw_xml_data: Dict = PrivateAttr(default_factory=dict)