Reviewed taxonomies of kinds of quantities

build.gradle

@@ -3,7 +3,7 @@
  */
 description='The FireSat example project'
 group = 'io.opencaesar.ontologies'
-version = '2.1.0'
+version = '2.2.0'
 
 /* 
  * The Gradle task dependencies 

src/oml/imce.jpl.nasa.gov/discipline/fse/fse.oml

@@ -14,6 +14,8 @@ vocabulary <http://imce.jpl.nasa.gov/discipline/fse/fse> with # as fse {
 
 	extends <http://iso.org/80000-6-magnitudes1>
 
+	uses <http://iso.org/80000-4-instances>
+
 	@rdfs:label "Reference Designated Element"
 	aspect ReferenceDesignatedElement :> base:IdentifiedElement
 
@@ -61,62 +63,52 @@ vocabulary <http://imce.jpl.nasa.gov/discipline/fse/fse> with # as fse {
 
 	ref concept project:WorkPackage :> MassAllocatedElement, MassEstimatedElement
 
-	@rdfs:label "Is Mass Of"
-	relation entity IsMassOf :> metrology:IsQuantityOf [
-		from 80000-4-quantities:mass
-		to MassConstrainedElement
-		forward isMassOf
-		reverse hasMass
+	@rdfs:label "Mass Estimate"
+	concept MassEstimate :> 80000-4-quantities:mass [
+		restricts all relation metrology:hasMagnitude to MassEstimateMagnitude
 	]
 
-	@rdfs:label "Is Mass Estimation Of"
-	relation entity IsMassEstimationOf :> IsMassOf [
-		from 80000-4-quantities:mass
-		to MassEstimatedElement
-		forward isMassEstimationOf
-		reverse hasMassEstimation
+	concept MassEstimateMagnitude :> 80000-4-units:MassMagnitude [
+		restricts relation metrology:hasReference to 80000-4-instances:kilogram
 	]
 
-	@rdfs:label "Is MEV Mass Of"
-	relation entity IsMEVMassOf :> IsMassEstimationOf [
-		from 80000-4-quantities:mass
-		to MassEstimatedElement
-		forward isMEVMassOf
-		reverse hasMEVMass
+	@rdfs:label "MEV Mass"
+	concept MEVMass :> MassEstimate [
+		restricts all relation metrology:hasMagnitude to MEVMagnitue
 	]
 
-	@rdfs:label "Is MGA Mass Of"
-	relation entity IsMGAMassOf :> IsMassEstimationOf [
-		from 80000-4-quantities:mass
-		to MassEstimatedElement
-		forward isMGAMassOf
-		reverse hasMGAMass
+	concept MEVMagnitue :> MassEstimateMagnitude
+
+	@rdfs:label "MGA Mass"
+	concept MGAMass :> MassEstimate [
+		restricts all relation metrology:hasMagnitude to MGAMagnitude
 	]
 
-	@rdfs:label "Is CBE Mass Of"
-	relation entity IsCBEMassOf :> IsMassEstimationOf [
-		from 80000-4-quantities:mass
-		to MassEstimatedElement
-		forward isCBEMassOf
-		reverse hasCBEMassOf
+	concept MGAMagnitude :> MassEstimateMagnitude
+
+	@rdfs:label "CBE Mass"
+	concept CBEMass :> MassEstimate [
+		restricts all relation metrology:hasMagnitude to CBEMagnitude
 	]
 
-	@rdfs:label "Is Mass Allocation Of"
-	relation entity IsMassAllocationOf :> IsMassOf [
-		from 80000-4-quantities:mass
-		to MassAllocatedElement
-		forward isMassAllocationOf
-		reverse hasMassAllocation
+	concept CBEMagnitude :> MassEstimateMagnitude
+
+	@rdfs:label "Mass Allocation"
+	concept MassAllocation :> 80000-4-quantities:mass [
+		restricts all relation metrology:hasMagnitude to MassAllocationMagnitude
 	]
 
-	@rdfs:label "Is Mass Limit Of"
-	relation entity IsMassLimitOf :> IsMassAllocationOf [
-		from 80000-4-quantities:mass
-		to MassAllocatedElement
-		forward isMassLimitOf
-		reverse hasMassLimit
+	concept MassAllocationMagnitude :> 80000-4-units:MassMagnitude [
+		restricts relation metrology:hasReference to 80000-4-instances:kilogram
 	]
 
+	@rdfs:label "Mass Limit"
+	concept MassLimit :> MassAllocation [
+		restricts all relation metrology:hasMagnitude to MassLimitMagnitude
+	]
+
+	concept MassLimitMagnitude :> MassAllocationMagnitude
+
 	@rdfs:label "Connects Assembly"
 	relation entity ConnectsAssembly :> analysis:AnalyzedElement, analysis:CharacterizedElement [
 		from Function

src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/pld/masses.oml

@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Payload Mass
 
 	@rdfs:label "Payload Mass Limit"
-	ci PayloadMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf pld:Payload
+	ci PayloadMassLimit : fse:MassLimit [
+		metrology:isQuantityOf pld:Payload
 	]
 
 	@rdfs:label "Payload Mass Limit Magnitude"
-	ci PayloadMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PayloadMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "28.1"^^xsd:double
 		metrology:isMagnitudeOf PayloadMassLimit
 	]

src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/spc/masses.oml

@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Spacecraft Mass
 
 	@rdfs:label "Spacecraft Mass Limit"
-	ci SpacecraftMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf spc:Spacecraft
+	ci SpacecraftMassLimit : fse:MassLimit [
+		metrology:isQuantityOf spc:Spacecraft
 	]
 
 	@rdfs:label "Spacecraft Mass Limit Magnitude"
-	ci SpacecraftMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SpacecraftMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "235.1"^^xsd:double
 		metrology:isMagnitudeOf SpacecraftMassLimit
 	]

src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/05/systems/pld/masses.oml

@@ -8,25 +8,25 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Payload Module Mass
 
 	@rdfs:label "Payload Module CBE Mass"
-	ci PayloadModuleCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf pld-assemblies:PayloadModule
+	ci PayloadModuleCBEMass : fse:CBEMass [
+		metrology:isQuantityOf pld-assemblies:PayloadModule
 	]
 
 	@rdfs:label "Payload Module CBE Mass Magnitude"
-	ci PayloadModuleCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PayloadModuleCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf PayloadModuleCBEMass
 	]
 
 	// Sensor Mass
 
 	@rdfs:label "Sensor CBE Mass"
-	ci SensorCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf pld-assemblies:Sensor
+	ci SensorCBEMass : fse:CBEMass [
+		metrology:isQuantityOf pld-assemblies:Sensor
 	]
 
 	@rdfs:label "Sensor CBE Mass Magnitude"
-	ci SensorCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SensorCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "28.1"^^xsd:double
 		metrology:isMagnitudeOf PayloadModuleCBEMass
 	]

src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/04/subsystems/sam/masses.oml

@@ -8,51 +8,51 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Power Control Unit Mass
 
 	@rdfs:label "Power Control Unit CBE Mass"
-	ci PowerControlUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf sam-assemblies:PowerControlUnit
+	ci PowerControlUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf sam-assemblies:PowerControlUnit
 	]
 
 	@rdfs:label "Power Control Unit CBE Mass Magnitude"
-	ci PowerControlUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PowerControlUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "5.96"^^xsd:double
 		metrology:isMagnitudeOf PowerControlUnitCBEMass
 	]
 
 	// EPS Regulators And Converters Unit Mass
 
 	@rdfs:label "EPS Regulators and Converters Unit CBE Mass"
-	ci EPSRegulatorsAndConvertersUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf sam-assemblies:EPSRegulatorsAndConvertersUnit
+	ci EPSRegulatorsAndConvertersUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf sam-assemblies:EPSRegulatorsAndConvertersUnit
 	]
 
 	@rdfs:label "EPS Regulators and Converters Unit CBE Mass Magnitude"
-	ci EPSRegulatorsAndConvertersUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci EPSRegulatorsAndConvertersUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "14.48"^^xsd:double
 		metrology:isMagnitudeOf EPSRegulatorsAndConvertersUnitCBEMass
 	]
 
 	// Solar Array With SADA 1 Mass
 
 	@rdfs:label "Solar Array With SADA 1 CBE Mass"
-	ci SolarArrayWithSADA1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf sam-assemblies:SolarArrayWithSADA1
+	ci SolarArrayWithSADA1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf sam-assemblies:SolarArrayWithSADA1
 	]
 
 	@rdfs:label "Solar Array With SADA 1 CBE Mass Magnitude"
-	ci SolarArrayWithSADA1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SolarArrayWithSADA1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "7.965"^^xsd:double
 		metrology:isMagnitudeOf SolarArrayWithSADA1CBEMass
 	]
 
 	// Solar Array With SADA 2 Mass
 
 	@rdfs:label "Solar Array With SADA 2 CBE Mass"
-	ci SolarArrayWithSADA2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf sam-assemblies:SolarArrayWithSADA2
+	ci SolarArrayWithSADA2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf sam-assemblies:SolarArrayWithSADA2
 	]
 
 	@rdfs:label "Solar Array With SADA 2 CBE Mass Magnitude"
-	ci SolarArrayWithSADA2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SolarArrayWithSADA2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "7.965"^^xsd:double
 		metrology:isMagnitudeOf SolarArrayWithSADA2CBEMass
 	]

src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/05/subsystems/thc/masses.oml

@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Thermal Blankets Mass
 
 	@rdfs:label "Thermal Blankets CBE Mass"
-	ci ThermalBlanketsCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf thc-assemblies:ThermalBlankets
+	ci ThermalBlanketsCBEMass : fse:CBEMass [
+		metrology:isQuantityOf thc-assemblies:ThermalBlankets
 	]
 
 	@rdfs:label "Thermal Blankets CBE Mass Magnitude"
-	ci ThermalBlanketsCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ThermalBlanketsCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.9"^^xsd:double
 		metrology:isMagnitudeOf ThermalBlanketsCBEMass
 	]

src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/06/subsystems/eps/masses.oml

@@ -8,38 +8,38 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Battery Pack 1 Mass
 
 	@rdfs:label "Battery Pack 1 CBE Mass"
-	ci BatteryPack1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf eps-assemblies:BatteryPack1
+	ci BatteryPack1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf eps-assemblies:BatteryPack1
 	]
 
 	@rdfs:label "Battery Pack 1 CBE Mass Magnitude"
-	ci BatteryPack1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci BatteryPack1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.103"^^xsd:double
 		metrology:isMagnitudeOf BatteryPack1CBEMass
 	]
 
 	// Battery Pack 2 Mass
 
 	@rdfs:label "Battery Pack 2 CBE Mass"
-	ci BatteryPack2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf eps-assemblies:BatteryPack2
+	ci BatteryPack2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf eps-assemblies:BatteryPack2
 	]
 
 	@rdfs:label "Battery Pack 2 CBE Mass Magnitude"
-	ci BatteryPack2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci BatteryPack2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.103"^^xsd:double
 		metrology:isMagnitudeOf BatteryPack2CBEMass
 	]
 
 	// Battery Pack 3 Mass
 
 	@rdfs:label "Battery Pack 3 CBE Mass"
-	ci BatteryPack3CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf eps-assemblies:BatteryPack3
+	ci BatteryPack3CBEMass : fse:CBEMass [
+		metrology:isQuantityOf eps-assemblies:BatteryPack3
 	]
 
 	@rdfs:label "Battery Pack 3 CBE Mass Magnitude"
-	ci BatteryPack3CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci BatteryPack3CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.103"^^xsd:double
 		metrology:isMagnitudeOf BatteryPack3CBEMass
 	]