Merge pull request #75 from ModelDriven/ST6RI-64

ST6RI-64: Added 15.01, 15.02, 15.12, and 15.19 validation cases

Author: seidewitz

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

@@ -58,6 +58,7 @@ package SI {
 	/* 
 	 * Prefixed units - incomplete list
 	 */
+	part mm = LengthUnit(name => "millimetre", unitConversion => ConversionByPrefix(prefix => milli, referenceUnit => m));
 	part km = LengthUnit(name => "kilometre", unitConversion => ConversionByPrefix(prefix => kilo, referenceUnit => m));
 	part mN = ForceUnit(name => "millinewton", unitConversion => ConversionByPrefix(prefix => milli, referenceUnit => N));
 	part kJ = EnergyUnit(name => "kilojoule", unitConversion => ConversionByPrefix(prefix => kilo, referenceUnit => J));

sysml.library/Kernel Library/RealFunctions.kerml

@@ -19,7 +19,9 @@ package RealFunctions {
 
 	function '='(x: Real, y: Real): Boolean specializes BaseFunctions::'==';
 	function '!='(x: Real, y: Real): Boolean specializes BaseFunctions::'!=';
-	
+		
+	function Sqrt(x: Real): Real;
+
 	function Floor(x: Real): Integer;
 	function Round(x: Real): Integer;
 

sysml/src/validation/15-Properties-Values-Expressions/15_01-Constants.sysml

@@ -0,0 +1,62 @@
+package '15_01-Constants' {
+    import SI::*;
+    import USCustomaryUnits::*;
+
+    /* Math and physical constants should be defined in the model library. */
+    
+     /**
+     Examples of mathematical constants
+     Note: There should be a way to mark these as "invariant" 
+     */
+    package 'Mathematical Constants' {
+        value e: Real = 2.71828182845904523536;
+        value pi: Real = 3.14159265358979323846;
+    }
+
+    /**
+     * Should this be in the ISQ library model?
+     */
+    value type DimensionOneValue :> QuantityValue {
+		value magnitude: Real redefines QuantityValue::magnitude;
+    	ref scale: UnitOfDimensionOne redefines QuantityValue::scale;
+    }
+    
+    /**
+     * Should this ibe in the ISQ library model?
+     */
+    block AccelerationUnit :> SIDerivedUnit {
+		value lengthPowerFactor :> SIDerivedUnit::lengthPowerFactor {
+			value exponent redefines UnitPowerFactor::exponent = 1;
+		}
+		value timePowerFactor :> SIDerivedUnit::timePowerFactor {
+			value exponent redefines UnitPowerFactor::exponent = -2;
+		}		
+    }
+    value type AccelerationValue :> QuantityValue {
+		value magnitude: Real redefines QuantityValue::magnitude;
+    	ref scale: AccelerationUnit redefines QuantityValue::scale;
+    }
+
+    /**
+     Examples of fundamental physical constants
+     Note: There should be a way to mark these as "invariant" 
+     */
+    /**
+     * The reference source is:
+     CODATA - Task Group on Fundamental Physical Constants (TGFC) - 2010 Recommended Values - See http://www.codata.org/committees-and-groups/fundamental-physical-constants/tgfc-previous-values-and-publications
+     */
+    package 'Fundamental Physical Constants' {
+        value 'fine structure constant': DimensionOneValue = 7.297352569824E-3;
+        value 'electron to proton mass ratio': DimensionOneValue = 5.446170217822E-4;
+        value 'speed of light in vacuum': SpeedValue = 299792458@[m/s];
+    }
+
+    package 'Global Context' {
+        value 'nominal earth gravitational acceleration': AccelerationValue = 9.80665@[m/(s^2)];
+    }
+
+    package 'Model X Context' {
+        value 'amplifier gain': DimensionOneValue = 3.5;
+    }
+
+}

sysml/src/validation/15-Properties-Values-Expressions/15_02-Basic Properties with Default Values.sysml

@@ -0,0 +1,18 @@
+package '15_02-Basic Properties with Default Values' {
+    import SI::*;
+    import USCustomaryUnits::*;
+    import '15_12-Compound Value Type'::CartesianAxisPlacement3D;
+
+    block Wheel {
+        value width: LengthValue = 245@[mm];
+        value diameter: LengthValue = 18@['in'];
+        value placement: CartesianAxisPlacement3D[0..1];
+    }
+
+    block Vehicle {
+        value mass: MassValue = 1200@[kg];
+        value length: LengthValue = 4.82@[m];
+        part leftFrontWheel : Wheel;
+        part rightFrontWheel : Wheel;
+    }
+}

sysml/src/validation/15-Properties-Values-Expressions/15_12-Compound Value Type.sysml

@@ -0,0 +1,34 @@
+package '15_12-Compound Value Type' {
+    import ISQ::*;
+    import RealFunctions::Sqrt;
+    import '15_01-Constants'::'Mathematical Constants'::pi;
+
+    value type CartesianLocation3D {
+		value x: LengthValue;
+		value y: LengthValue;
+		value z: LengthValue;
+    }
+
+	/* Is this supposed to be a QuantityValue? */
+    value type DirectionValue :> Real;
+
+    value type CartesianDirection3D {
+		value dirX: DirectionValue;
+		value dirY: DirectionValue;
+		value dirZ: DirectionValue;
+		
+		assert constraint { Sqrt(dirX**2 + dirY**2 + dirZ**2) == 1.0 }
+    }
+
+    /* 
+       Axis placement is modeled after the ISO 10303 (STEP) standard
+       way of defining numerically stable coordinate
+       transformations. The corresponding STEP concept is
+       AxisPlacement3D.
+     */
+    value type CartesianAxisPlacement3D {
+		value location: CartesianLocation3D;
+		value dirZAxis: CartesianDirection3D;
+		value dirXAxis: CartesianDirection3D;
+    }
+}

sysml/src/validation/15-Properties-Values-Expressions/15_19-Materials with Properties.sysml

@@ -0,0 +1,70 @@
+package '15_19-Materials with Properties' {
+	import SI::*;
+	
+	/** This needs to be fully defined. */
+    block AtomicMassUnit :> MeasurementUnit;
+        
+    part Da = AtomicMassUnit();
+
+    value type AtomicMassValue :> QuantityValue {
+		value magnitude: Real redefines QuantityValue::magnitude;
+    	ref scale: AtomicMassUnit redefines QuantityValue::scale;
+    }
+    
+    block TensileStrengthUnit :> MeasurementUnit {
+		value lengthPowerFactor redefines SIDerivedUnit::lengthPowerFactor {
+			value exponent redefines UnitPowerFactor::exponent = -1;
+		}
+		value massPowerFactor redefines SIDerivedUnit::massPowerFactor {
+			value exponent redefines UnitPowerFactor::exponent = 1;
+		}
+		value timePowerFactor redefines SIDerivedUnit::timePowerFactor {
+			value exponent redefines UnitPowerFactor::exponent = -2;
+		}
+    }
+    
+    value type TensileStrengthValue :> QuantityValue {
+		value magnitude: Real redefines QuantityValue::magnitude;
+    	ref scale: TensileStrengthUnit redefines QuantityValue::scale;
+    }
+
+    block Substance;
+
+    block Material :> Substance;
+
+    value type MassFractionValue;
+
+    value type MaterialFraction {
+        ref material: Material; 
+        value massFraction: MassFractionValue;
+    }
+
+    block Metal :> Material {
+        value atomicMass: AtomicMassValue;
+    }
+
+    part Iron: Metal { // Individual
+        value atomicMass redefines Metal::atomicMass = 55.845@[Da];
+    }
+
+    part Carbon: Metal { // Individual
+        value atomicMass redefines Metal::atomicMass = 12.011@[Da];
+    }
+
+    part Manganese: Metal { // Individual
+        value atomicMass redefines Metal::atomicMass = 54.938@[Da];
+    }
+
+    block Alloy :> Material {
+        value fractions: MaterialFraction[2..*];
+    }
+
+    part Steel_980: Alloy { // Individual
+        value fractions redefines Alloy::fractions = { 
+        	MaterialFraction(Iron, 0.9862), 
+        	MaterialFraction(Carbon, 0.0018), 
+        	MaterialFraction(Manganese, 0.012)
+        };
+        value tensileStrength: TensileStrengthValue = 980@[N/(mm^2)];
+    }
+}