Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to QUDT v2.1.4 #2

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Update to QUDT v2.1.4 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ab107f1
hook up tox for testing
gnmerritt Oct 15, 2020
8d1eb7f
move to custom frozendict with deprecation messages fixed
gnmerritt Oct 16, 2020
825a6b9
check in QUDT v2.1.4 turtle resource files
gnmerritt Oct 16, 2020
a543f9e
update code and most hard-coded units to work with QUDT v2.1.4
gnmerritt Oct 16, 2020
9523969
update setup.py to keep requirements DRY
gnmerritt Oct 16, 2020
59e21c4
rename schema files and add to package data
gnmerritt Oct 16, 2020
677955f
add thousand pounds per hour (kpph)
gnmerritt Oct 16, 2020
7d59ff8
ignore thermal energy quanity kind
gnmerritt Oct 27, 2020
58426c8
disregard heat flow rate
gnmerritt Oct 27, 2020
91c4dc2
bump rdflib to 6.x, drop python 3.6 support
gnmerritt Sep 22, 2021
a64f12d
make us gallons convertible to other volume units
gnmerritt Dec 21, 2021
44685b5
add Volume to Liter to make it work now that LiquidVolume is ignored
gnmerritt Dec 21, 2021
ce4299f
more tweaks, all tests passing now
gnmerritt Dec 21, 2021
c4e579f
add VolumePerUnitTime to L-PER-HR
gnmerritt Jan 24, 2022
d90356d
first try at adding natural gas units
gnmerritt Apr 6, 2022
929756c
fix syntax error
gnmerritt Apr 6, 2022
51735c4
add test for conversion to joules
gnmerritt Apr 6, 2022
2579e82
treat kJ/kg as SpecificEnergy
gnmerritt Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions qudt/ontology/qudt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,31 @@
from qudt.ontology.ontology_utils import OntologyUtils


OntologyUtils.register_namespace('qudt', 'http://qudt.org/schema/qudt#')
OntologyUtils.register_namespace('qudt', 'http://qudt.org/schema/qudt/')
OntologyUtils.register_namespace('kind', 'http://qudt.org/vocab/quantitykind/')


class QUDT(object):
domain = "http://qudt.org/"
namespace = OntologyUtils.get_namespace('qudt')

SYMBOL = OntologyUtils.get_iri('qudt', 'symbol')
ABBREVIATION = OntologyUtils.get_iri('qudt', 'abbreviation')
CONVERSION_OFFSET = OntologyUtils.get_iri('qudt', 'conversionOffset')
CONVERSION_MULTIPLIER = OntologyUtils.get_iri('qudt', 'conversionMultiplier')
QUANTIY_KIND = OntologyUtils.get_iri('qudt', 'hasQuantityKind')

SI_UNIT = OntologyUtils.get_iri('qudt', 'SIUnit')
SI_BASE_UNIT = OntologyUtils.get_iri('qudt', 'SIBaseUnit')
SI_UNIT = OntologyUtils.get_iri('qudt', 'SI-Unit')
SI_BASE_UNIT = OntologyUtils.get_iri('qudt', 'BaseUnit')
SI_DERIVED_UNIT = OntologyUtils.get_iri('qudt', 'SIDerivedUnit')
DERIVED_UNIT = OntologyUtils.get_iri('qudt', 'DerivedUnit')
NOT_USED_WITH_SI_UNIT = OntologyUtils.get_iri('qudt', 'NotUsedWithSIUnit')
USED_WITH_SI_UNIT = OntologyUtils.get_iri('qudt', 'UsedWithSIUnit')

THERMODYNAMIC_TEMP = OntologyUtils.get_iri('kind', 'ThermodynamicTemperature')
CELSIUS_TEMP = OntologyUtils.get_iri('kind', 'CelciusTemperature')
THERMAL_ENERGY = OntologyUtils.get_iri('kind', 'ThermalEnergy')
HEAT_FLOW_RATE = OntologyUtils.get_iri('kind', 'HeatFlowRate')
LIQUID_VOLUME = OntologyUtils.get_iri('kind', 'LiquidVolume')
VOLUME_FLOW_RATE = OntologyUtils.get_iri('kind', 'VolumeFlowRate')
IONIZATION_ENERGY = OntologyUtils.get_iri('kind', 'IonizationEnergy')
9 changes: 5 additions & 4 deletions qudt/ontology/resources/openphacts.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
"rdfs": "http://www.w3.org/2000/01/rdf-schema#",
"skos": "http://www.w3.org/2004/02/skos/core#",
"xsd": "http://www.w3.org/2001/XMLSchema#"
"xsd": "http://www.w3.org/2001/XMLSchema#",
"kind": "http://qudt.org/vocab/quantitykind/"
Copy link
Owner

Choose a reason for hiding this comment

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

Small request, can you keep lists in alphabetical order?

},
"@graph": [
{
Expand All @@ -27,7 +28,7 @@
"@id": "http://www.openphacts.org/units/Nanomolar",
"@type": [
"qudt:SIDerivedUnit",
"qudt:MolarConcentrationUnit"
"kind:AmountOfSubstancePerUnitVolume"
],
"qudt:abbreviation": "nM",
"qudt:conversionMultiplier": {
Expand Down Expand Up @@ -56,7 +57,7 @@
{
"@id": "http://www.openphacts.org/units/Molar",
"@type": [
"qudt:MolarConcentrationUnit",
"kind:AmountOfSubstancePerUnitVolume",
"qudt:SIDerivedUnit"
],
"qudt:abbreviation": "M",
Expand Down Expand Up @@ -532,4 +533,4 @@
"rdfs:label": "Gram per Liter"
}
]
}
}
Loading