Merge pull request #316 from Systems-Modeling/ST6RI-416

ST6RI-416 Complete SI and USCustomaryUnits libraries

Author: seidewitz

org.omg.sysml.xpect.tests/library.domain/Quantities and Units/SI.sysml

@@ -72,8 +72,7 @@ package Time {
 	 * For UTC see https://en.wikipedia.org/wiki/Coordinated_Universal_Time
 	 * For TAI see https://en.wikipedia.org/wiki/International_Atomic_Time
 	 */
-	attribute UTC: TimeScale {
-		attribute :>> longName = "Coordinated Universal Time";
+	attribute <UTC> 'Coordinated Universal Time' : TimeScale {
 		attribute :>> unit = SI::s;
 		attribute :>> definitionalEpoch: DefinitionalQuantityValue { :>> num = 0; :>> definition = "UTC epoch at 1 January 1958 at 0 hour 0 minute 0 second"; }
 	}

org.omg.sysml.xpect.tests/library.domain/Quantities and Units/Time.sysml

@@ -32,7 +32,6 @@ package UnitsAndScales {
 	 * To stress the generality of the TensorMeasurementReference the alias MeasurementReference is defined.
 	 */
 	attribute def TensorMeasurementReference :> Array {
-		attribute longName: String[1];
 		attribute isBound: Boolean[1] default false;
 		attribute order :>> rank;
 		attribute mRefs: ScalarMeasurementReference[1..*] :>> elements;
@@ -271,7 +270,6 @@ package UnitsAndScales {
 	 * Explicit definitions of "unit of dimension one" also known as "dimensionless unit" as well as the value and quantity of dimension one.
 	 */
 	attribute def DimensionOneUnit :> DerivedUnit {
-		attribute :>> longName = "unit of dimension one";
 		attribute :>> unitPowerFactors = ();
 	}
 	attribute def DimensionOneValue :> ScalarQuantityValue {

org.omg.sysml.xpect.tests/library.domain/Quantities and Units/USCustomaryUnits.sysml

@@ -72,8 +72,7 @@ package Time {
 	 * For UTC see https://en.wikipedia.org/wiki/Coordinated_Universal_Time
 	 * For TAI see https://en.wikipedia.org/wiki/International_Atomic_Time
 	 */
-	attribute UTC: TimeScale {
-		attribute :>> longName = "Coordinated Universal Time";
+	attribute <UTC> 'Coordinated Universal Time' : TimeScale {
 		attribute :>> unit = SI::s;
 		attribute :>> definitionalEpoch: DefinitionalQuantityValue { :>> num = 0; :>> definition = "UTC epoch at 1 January 1958 at 0 hour 0 minute 0 second"; }
 	}

org.omg.sysml.xpect.tests/library.domain/Quantities and Units/UnitsAndScales.sysml

@@ -32,7 +32,6 @@ package UnitsAndScales {
 	 * To stress the generality of the TensorMeasurementReference the alias MeasurementReference is defined.
 	 */
 	attribute def TensorMeasurementReference :> Array {
-		attribute longName: String[1];
 		attribute isBound: Boolean[1] default false;
 		attribute order :>> rank;
 		attribute mRefs: ScalarMeasurementReference[1..*] :>> elements;
@@ -271,7 +270,6 @@ package UnitsAndScales {
 	 * Explicit definitions of "unit of dimension one" also known as "dimensionless unit" as well as the value and quantity of dimension one.
 	 */
 	attribute def DimensionOneUnit :> DerivedUnit {
-		attribute :>> longName = "unit of dimension one";
 		attribute :>> unitPowerFactors = ();
 	}
 	attribute def DimensionOneValue :> ScalarQuantityValue {

sysml.library/Domain Libraries/Quantities and Units/SI.sysml

@@ -8,7 +8,6 @@ package '15_13-Discretely Sampled Function Value' {
 	import Time::*;
 
 	attribute def MissionElapsedTimeScale :> TimeScale {
-    	:>> longName = "mission elapsed time starting at launch";
 		:>> unit = s;
 		attribute :>> definitionalEpoch {
 			:>> num = 0;

sysml.library/Domain Libraries/Quantities and Units/Time.sysml

@@ -18,9 +18,7 @@ package '15_19-Materials with Properties' {
     	attribute :>> mRef: TensileStrengthUnit;
     }
 
-    attribute 'N/mm²': TensileStrengthUnit = N / mm^2 {
-    	:>> longName = "newton per square millimetre";
-    }
+    attribute <'N/mm²'> 'newton per square millimetre' : TensileStrengthUnit = N / mm^2;
 
     part def Substance;
     part def Material :> Substance;