Updated for 2022-09 (except for specs).

Systems-Modeling · Oct 21, 2022 · ebcd3ee · ebcd3ee
1 parent 7d4b2dc
commit ebcd3ee
Show file tree

Hide file tree

Showing 117 changed files with 2,607 additions and 772 deletions.
diff --git a/doc/Intro to the SysML v2 Language-Textual Notation.pdf b/doc/Intro to the SysML v2 Language-Textual Notation.pdf
diff --git a/install/eclipse/org.omg.sysml.site.zip b/install/eclipse/org.omg.sysml.site.zip
diff --git a/install/jupyter/README.pdf b/install/jupyter/README.pdf
diff --git a/install/jupyter/install.bat b/install/jupyter/install.bat
@@ -20,7 +20,7 @@
 
 @echo off
 
-set /A SYSML_VERSION="0.27.0"
+set /A SYSML_VERSION="0.28.1"
 
 echo --- Step 1: Testing Conda installation ---
 where conda

diff --git a/install/jupyter/install.sh b/install/jupyter/install.sh
@@ -21,7 +21,7 @@
 
 set -e
 
-SYSML_VERSION="0.27.0"
+SYSML_VERSION="0.28.1"
 
 echo "--- Step 1: Testing Conda installation ---"
 command -v conda || (echo "Conda is not installed. Please install Conda and re-run." && return 1)

diff --git a/kerml/src/examples/Simple Tests/Expressions.kerml b/kerml/src/examples/Simple Tests/Expressions.kerml
@@ -55,4 +55,10 @@ package Expressions {
 	class C {
 		count := 0;
 	}
+
+	feature obj1 : C;
+	feature obj2 : C;
+
+	test1 = obj1 === obj2;
+	test2 = x !== obj2;
 }
diff --git a/kerml/src/examples/Simple Tests/Filtering.kerml b/kerml/src/examples/Simple Tests/Filtering.kerml
@@ -18,18 +18,32 @@ package Filtering {
 	            level = 2;
 	        }
 	    }
+		composite feature system : System;
 	}
-	
+
 	package UpperLevelApprovals {
 	    import DesignModel::**;
-	    filter @Annotations::ApprovalAnnotation and 
-	           Annotations::ApprovalAnnotation::approved and 
+	    filter Annotations::ApprovalAnnotation::approved and 
 	           Annotations::ApprovalAnnotation::level > 1;
+
+	    struct Test :> System;
 	}
 
 	package UpperLevelApprovals1 {
 	    import Annotations::**;
-	    import DesignModel::**[@ApprovalAnnotation and approved and level > 1];
+	    import DesignModel::**[@Structure][approved and level > 1];
+
+	    struct Test :> System;	    
+	}
+
+ import KerML::*;
+	package Meta {
+		import DesignModel::*;
+		filter (Element::name == "System" and not Type::isAbstract) or 
+		       Feature::isComposite;
+
+		struct Test :> System; 
+		feature :> system;
 	}
 
 }
diff --git a/kerml/src/examples/Simple Tests/MetadataTest.kerml b/kerml/src/examples/Simple Tests/MetadataTest.kerml
@@ -1,7 +1,7 @@
 package MetadataTest {
 	import 'User Defined Extensions'::*;
 
-	package 'User Defined Extensions' {
+	library package 'User Defined Extensions' {
 
 		datatype ClassificationLevel :> ScalarValues::Natural;
 		feature uncl[1] : ClassificationLevel = 0;

diff --git a/sysml.library/Domain Libraries/Analysis/AnalysisTooling.sysml b/sysml.library/Domain Libraries/Analysis/AnalysisTooling.sysml
@@ -1,4 +1,4 @@
-package AnalysisTooling {
+standard library package AnalysisTooling {
 	doc
 	/*
 	 * This package contains definitions for metadata annotations related

diff --git a/sysml.library/Domain Libraries/Analysis/SampledFunctions.sysml b/sysml.library/Domain Libraries/Analysis/SampledFunctions.sysml
@@ -1,4 +1,4 @@
-package SampledFunctions {
+standard library package SampledFunctions {
 	doc
 	/*
 	 * This package provides a library model of discretely sampled mathematical functions.

diff --git a/sysml.library/Domain Libraries/Analysis/StateSpaceRepresentation.sysml b/sysml.library/Domain Libraries/Analysis/StateSpaceRepresentation.sysml
@@ -1,4 +1,4 @@
-package StateSpaceRepresentation {
+standard library package StateSpaceRepresentation {
 	doc
 	/*
 	 * This package provides a model of the foundational state-space system representation, 

diff --git a/sysml.library/Domain Libraries/Analysis/TradeStudies.sysml b/sysml.library/Domain Libraries/Analysis/TradeStudies.sysml
@@ -1,4 +1,4 @@
-package TradeStudies {
+standard library package TradeStudies {
 	doc
 	/*
 	 * This package provides a simple framework for defining trade-off study analysis cases.

diff --git a/sysml.library/Domain Libraries/Cause and Effect/CausationConnections.sysml b/sysml.library/Domain Libraries/Cause and Effect/CausationConnections.sysml
@@ -1,4 +1,4 @@
-package CausationConnections {	
+standard library package CausationConnections {	
 	doc 
 	/* 
 	 * This package provides a library model modeling causes, effects, and causation connections 

diff --git a/sysml.library/Domain Libraries/Cause and Effect/CauseAndEffect.sysml b/sysml.library/Domain Libraries/Cause and Effect/CauseAndEffect.sysml
@@ -1,4 +1,4 @@
-package CauseAndEffect {
+standard library package CauseAndEffect {
 	doc /* This package provides language-extension metadata for cause-effect modeling. */
 
 	import CausationConnections::*;
@@ -67,7 +67,7 @@ package CauseAndEffect {
 		 * MulticausationMetadata is SemanticMetadata for a Multicausation connection.
 		 */
 
-		ref :>> baseType = multicausations as SysML::Usage;
+		ref :>> baseType = multicausations meta SysML::Usage;
 	}
 
 	metadata def <causation> CausationSemanticMetadadata :> CausationMetadata, SemanticMetadata {
@@ -76,6 +76,6 @@ package CauseAndEffect {
 		 * CausationMetadata is SemanticMetadata for a Causation connection.
 		 */
 
-		ref :>> baseType = causations as SysML::Usage;
+		ref :>> baseType = causations meta SysML::Usage;
 	}
 }
diff --git a/sysml.library/Domain Libraries/Geometry/ShapeItems.sysml b/sysml.library/Domain Libraries/Geometry/ShapeItems.sysml
@@ -1,4 +1,4 @@
-package ShapeItems {
+standard library package ShapeItems {
 	doc
 	/*
 	 * This package provides a model of items that represent basic geometric shapes. 

diff --git a/sysml.library/Domain Libraries/Geometry/SpatialItems.sysml b/sysml.library/Domain Libraries/Geometry/SpatialItems.sysml
@@ -1,4 +1,4 @@
-package SpatialItems {
+standard library package SpatialItems {
 	doc
 	/*
 	 * This package models physical items that have a spatial extent and act as a spatial frame of reference

diff --git a/sysml.library/Domain Libraries/Metadata/ImageMetadata.sysml b/sysml.library/Domain Libraries/Metadata/ImageMetadata.sysml
@@ -1,4 +1,4 @@
-package ImageMetadata {
+standard library package ImageMetadata {
 	doc
 	/*
 	 * This package provides attributive data and metadata to allow a model element to be

diff --git a/sysml.library/Domain Libraries/Metadata/ModelingMetadata.sysml b/sysml.library/Domain Libraries/Metadata/ModelingMetadata.sysml
@@ -1,4 +1,4 @@
-package ModelingMetadata {
+standard library package ModelingMetadata {
 	doc
 	/*
 	 * This package contains definitions of metadata generally useful for annotating models.

diff --git a/sysml.library/Domain Libraries/Metadata/ParametersOfInterestMetadata.sysml b/sysml.library/Domain Libraries/Metadata/ParametersOfInterestMetadata.sysml
@@ -1,4 +1,4 @@
-package ParametersOfInterestMetadata {
+standard library package ParametersOfInterestMetadata {
 	doc
 	/*
 	 * This package contains definitions of metadata to identify key parameters of interest,
@@ -23,7 +23,7 @@ package ParametersOfInterestMetadata {
 	 	 */
 
 	 	:>> annotatedElement : SysML::Usage;
-	 	:>> baseType = measuresOfEffectiveness as SysML::Usage;
+	 	:>> baseType = measuresOfEffectiveness meta SysML::Usage;
 	 }
 
 	 metadata def <mop> MeasureOfPerformance :> SemanticMetadata {
@@ -34,6 +34,6 @@ package ParametersOfInterestMetadata {
 	 	 */
 
 	 	:>> annotatedElement : SysML::Usage;
-	 	:>> baseType = measuresOfPerformance as SysML::Usage;
+	 	:>> baseType = measuresOfPerformance meta SysML::Usage;
 	 }
 }
diff --git a/sysml.library/Domain Libraries/Metadata/RiskMetadata.sysml b/sysml.library/Domain Libraries/Metadata/RiskMetadata.sysml
@@ -1,4 +1,4 @@
-package RiskMetadata {
+standard library package RiskMetadata {
 	doc
 	/*
 	 * This package defines metadata for annotating model elements with assessments of risk.

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQ.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQ.sysml
@@ -1,4 +1,4 @@
-package ISQ {
+standard library package ISQ {
     doc
     /*
      * International system of quantities (ISQ), as defined in ISO/IEC 80000

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQAcoustics.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQAcoustics.sysml
@@ -1,4 +1,4 @@
-package ISQAcoustics {
+standard library package ISQAcoustics {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQAtomicNuclear.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQAtomicNuclear.sysml
@@ -1,4 +1,4 @@
-package ISQAtomicNuclear {
+standard library package ISQAtomicNuclear {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQBase.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQBase.sysml
@@ -1,4 +1,4 @@
-package ISQBase {
+standard library package ISQBase {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQCharacteristicNumbers.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQCharacteristicNumbers.sysml
@@ -1,4 +1,4 @@
-package ISQCharacteristicNumbers {
+standard library package ISQCharacteristicNumbers {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQChemistryMolecular.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQChemistryMolecular.sysml
@@ -1,4 +1,4 @@
-package ISQChemistryMolecular {
+standard library package ISQChemistryMolecular {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQCondensedMatter.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQCondensedMatter.sysml
@@ -1,4 +1,4 @@
-package ISQCondensedMatter {
+standard library package ISQCondensedMatter {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQElectromagnetism.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQElectromagnetism.sysml
@@ -1,4 +1,4 @@
-package ISQElectromagnetism {
+standard library package ISQElectromagnetism {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQInformation.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQInformation.sysml
@@ -1,4 +1,4 @@
-package ISQInformation {
+standard library package ISQInformation {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQLight.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQLight.sysml
@@ -1,4 +1,4 @@
-package ISQLight {
+standard library package ISQLight {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQMechanics.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQMechanics.sysml
@@ -1,4 +1,4 @@
-package ISQMechanics {
+standard library package ISQMechanics {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQSpaceTime.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQSpaceTime.sysml
@@ -1,4 +1,4 @@
-package ISQSpaceTime {
+standard library package ISQSpaceTime {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/ISQThermodynamics.sysml b/sysml.library/Domain Libraries/Quantities and Units/ISQThermodynamics.sysml
@@ -1,4 +1,4 @@
-package ISQThermodynamics {
+standard library package ISQThermodynamics {
     doc
     /*
      * International System of Quantities and Units

diff --git a/sysml.library/Domain Libraries/Quantities and Units/MeasurementReferences.sysml b/sysml.library/Domain Libraries/Quantities and Units/MeasurementReferences.sysml
@@ -1,4 +1,4 @@
-package MeasurementReferences {
+standard library package MeasurementReferences {
 	doc
 	/*
 	 * This package defines the representations for measurement references.

diff --git a/sysml.library/Domain Libraries/Quantities and Units/Quantities.sysml b/sysml.library/Domain Libraries/Quantities and Units/Quantities.sysml
@@ -1,4 +1,4 @@
-package Quantities {
+standard library package Quantities {
 	doc
 	/*
 	 * This package defines the root representations for quantities and their values.

diff --git a/sysml.library/Domain Libraries/Quantities and Units/QuantityCalculations.sysml b/sysml.library/Domain Libraries/Quantities and Units/QuantityCalculations.sysml
@@ -1,4 +1,4 @@
-package QuantityCalculations {
+standard library package QuantityCalculations {
 	import ScalarValues::*;
     import Quantities::ScalarQuantityValue;
     import MeasurementReferences::ScalarMeasurementReference;

diff --git a/sysml.library/Domain Libraries/Quantities and Units/SI.sysml b/sysml.library/Domain Libraries/Quantities and Units/SI.sysml
@@ -1,4 +1,4 @@
-package SI {
+standard library package SI {
 	doc
 	/*
 	 * International System of (Measurement) Units -- Système International d'Unités (SI), as defined in ISO/IEC 80000

diff --git a/sysml.library/Domain Libraries/Quantities and Units/SIPrefixes.sysml b/sysml.library/Domain Libraries/Quantities and Units/SIPrefixes.sysml
@@ -1,4 +1,4 @@
-package SIPrefixes {
+standard library package SIPrefixes {
 	doc
 	/*
 	 * Definition of SI unit prefixes as specified in ISO/IEC 80000-1

diff --git a/sysml.library/Domain Libraries/Quantities and Units/Time.sysml b/sysml.library/Domain Libraries/Quantities and Units/Time.sysml
@@ -1,4 +1,4 @@
-package Time {
+standard library package Time {
 	doc
 	/*
 	 * This package specifies concepts to support time-related quantities and metrology, beyond 

diff --git a/sysml.library/Domain Libraries/Quantities and Units/USCustomaryUnits.sysml b/sysml.library/Domain Libraries/Quantities and Units/USCustomaryUnits.sysml
@@ -1,4 +1,4 @@
-package <USCU> USCustomaryUnits {
+standard library package <USCU> USCustomaryUnits {
 	doc
 	/*
 	 * Measurement unit declarations generated from NIST SP811 Appendix B

diff --git a/sysml.library/Domain Libraries/Quantities and Units/VectorCalculations.sysml b/sysml.library/Domain Libraries/Quantities and Units/VectorCalculations.sysml
@@ -1,4 +1,4 @@
-package VectorCalculations {
+standard library package VectorCalculations {
 	private import ScalarValues::Boolean;
 	private import ScalarValues::Number;
     private import Quantities::VectorQuantityValue;

diff --git a/sysml.library/Domain Libraries/Requirement Derivation/DerivationConnections.sysml b/sysml.library/Domain Libraries/Requirement Derivation/DerivationConnections.sysml
@@ -1,4 +1,4 @@
-package DerivationConnections {
+standard library package DerivationConnections {
 	doc
 	/*
 	 * This package provides a library model for derivation connections between requirements.

diff --git a/sysml.library/Domain Libraries/Requirement Derivation/RequirementDerivation.sysml b/sysml.library/Domain Libraries/Requirement Derivation/RequirementDerivation.sysml
@@ -1,4 +1,4 @@
-package RequirementDerivation {
+standard library package RequirementDerivation {
 	doc /* This package provides language-extension metadata for modeling requirement derivation. */
 
 	import DerivationConnections::*;
@@ -12,7 +12,7 @@ package RequirementDerivation {
 		 */
 
 		:> annotatedElement : SysML::Usage;
-		:>> baseType = derivedRequirements as SysML::Usage;		
+		:>> baseType = derivedRequirements meta SysML::Usage;
 	}
 
 	metadata def <derive> DerivedRequirementMetadata :> SemanticMetadata {
@@ -23,7 +23,7 @@ package RequirementDerivation {
 		 */
 
 		:> annotatedElement : SysML::Usage;	
-		:>> baseType = originalRequirements as SysML::Usage;
+		:>> baseType = originalRequirements meta SysML::Usage;
 	}
 
 	metadata def <derivation> DerivationMetadata :> SemanticMetadata {
@@ -34,6 +34,6 @@ package RequirementDerivation {
 
 		:> annotatedElement : SysML::ConnectionDefinition;
 		:> annotatedElement : SysML::ConnectionUsage;
-		:>> baseType = derivations as SysML::Usage;
+		:>> baseType = derivations meta SysML::Usage;
 	}	
 }
diff --git a/sysml.library/Kernel Libraries/Kernel Data Type Library/Collections.kerml b/sysml.library/Kernel Libraries/Kernel Data Type Library/Collections.kerml
@@ -1,4 +1,4 @@
-package Collections {
+standard library package Collections {
 	doc
 	/*
 	 * This package defines a standard set of Collection data types. Unlike sequences of values 

diff --git a/sysml.library/Kernel Libraries/Kernel Data Type Library/ScalarValues.kerml b/sysml.library/Kernel Libraries/Kernel Data Type Library/ScalarValues.kerml
@@ -1,4 +1,4 @@
-package ScalarValues {
+standard library package ScalarValues {
 	doc
 	/*
 	 * This package contains a basic set of primitive scalar (non-collection) data types. 

diff --git a/sysml.library/Kernel Libraries/Kernel Data Type Library/VectorValues.kerml b/sysml.library/Kernel Libraries/Kernel Data Type Library/VectorValues.kerml
@@ -1,4 +1,4 @@
-package VectorValues {
+standard library package VectorValues {
 	doc
 	/*
 	 * This package provides a basic model of abstract vectors as well as concrete vectors