Skip to content

Commit

Permalink
Updated for 2024-02.
Browse files Browse the repository at this point in the history
  • Loading branch information
seidewitz committed Mar 8, 2024
1 parent 2c400a9 commit 444fb88
Show file tree
Hide file tree
Showing 140 changed files with 114,239 additions and 113,941 deletions.
Binary file modified doc/1-Kernel_Modeling_Language.pdf
Binary file not shown.
Binary file modified doc/2a-OMG_Systems_Modeling_Language.pdf
Binary file not shown.
Binary file modified doc/2b-SysML_v1_to_v2_Transformation.pdf
Binary file not shown.
Binary file modified doc/3-Systems_Modeling_API_and_Services.pdf
Binary file not shown.
Binary file modified doc/Intro to the SysML v2 Language-Textual Notation.pdf
Binary file not shown.
Binary file modified install/eclipse/org.omg.sysml.site.zip
Binary file not shown.
Binary file modified install/jupyter/README.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion install/jupyter/install.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

@echo off

set SYSML_VERSION="0.38.0"
set SYSML_VERSION="0.39.0"

echo --- Step 1: Testing Conda installation ---
where conda
Expand Down
2 changes: 1 addition & 1 deletion install/jupyter/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

set -e

SYSML_VERSION="0.38.0"
SYSML_VERSION="0.39.0"

echo "--- Step 1: Testing Conda installation ---"
command -v conda || (echo "Conda is not installed. Please install Conda and re-run." && return 1)
Expand Down
6 changes: 3 additions & 3 deletions kerml/src/examples/Simple Tests/Comments.kerml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package Comments {
*
* CCCC
*/
/*
locale "en_US" /*
* AAAA
* BBBB
* CCC DDD
Expand All @@ -33,14 +33,14 @@ package Comments {
comment cmt_cmt about cmt /* Other Comment about Comment */

class C {
doc /* Documentation on Class C */
doc locale "en_US"/* Documentation on Class C */
comment /* Comment in Class C */
comment about Comments /* Comment about Package */

}
/* abc */
class A {
doc <a> /* Documentation comment on A*/
comment about a /* Comment about documenation with ID 'a' */
comment about a locale "en_US" /* Comment about documenation with ID 'a' */
}
}
1 change: 1 addition & 0 deletions kerml/src/examples/Simple Tests/Expressions.kerml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package Expressions {
y = NumericalFunctions::'+'(1,2);
z : Boolean = aa & true xor zz | false implies z;
zz : Boolean = aa and true xor aa or false implies z;
grp = -x + x * y * y + a ** 3 ^ 4;

b = if x > y? x-y else y-x;
c = x->collect {in xx; xx + 1};
Expand Down
6 changes: 6 additions & 0 deletions kerml/src/examples/Simple Tests/MetadataTest.kerml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,10 @@ package MetadataTest {
private #Classified #Security feature z1;
abstract #Classified z2;

feature z {
#Security #Classified metadata Classified {
classificationLevel = secret;
}
}

}
48 changes: 24 additions & 24 deletions sysml.library.xmi/Domain Libraries/Analysis/AnalysisTooling.sysmlx
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
<?xml version="1.0" encoding="ASCII"?>
<sysml:Namespace xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sysml="https://www.omg.org/spec/SysML/20230201" xmi:id="937ac1d2-9c3a-4992-b627-8ab08dc1f242" elementId="937ac1d2-9c3a-4992-b627-8ab08dc1f242">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="d6e94720-fe63-4154-aa7f-38e982e6bf6f" elementId="d6e94720-fe63-4154-aa7f-38e982e6bf6f">
<ownedRelatedElement xsi:type="sysml:LibraryPackage" xmi:id="4e927f98-8d7d-5bd1-a1ea-81cc460b41e3" declaredName="AnalysisTooling" isStandard="true">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="51ce199e-2c5f-48a7-9c35-062919dfea77" elementId="51ce199e-2c5f-48a7-9c35-062919dfea77">
<ownedRelatedElement xsi:type="sysml:Documentation" xmi:id="8887f68b-400a-40c4-9e69-017d0f08ab92" elementId="8887f68b-400a-40c4-9e69-017d0f08ab92" body="This package contains definitions for metadata annotations related&#xA;to analysis tool integration.&#xA;"/>
<sysml:Namespace xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sysml="https://www.omg.org/spec/SysML/20240201" xmi:id="412b3321-213e-4f1d-a666-90ac7fd4aaaa" elementId="412b3321-213e-4f1d-a666-90ac7fd4aaaa">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="e7c410c0-102b-4ed4-9495-3a1b05819291" elementId="e7c410c0-102b-4ed4-9495-3a1b05819291">
<ownedRelatedElement xsi:type="sysml:LibraryPackage" xmi:id="4e927f98-8d7d-5bd1-a1ea-81cc460b41e3" elementId="4e927f98-8d7d-5bd1-a1ea-81cc460b41e3" declaredName="AnalysisTooling" isStandard="true">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="7cc26945-d715-41d1-9bfb-e2c0e7da8bb0" elementId="7cc26945-d715-41d1-9bfb-e2c0e7da8bb0">
<ownedRelatedElement xsi:type="sysml:Documentation" xmi:id="979082d9-4cc9-4023-8cd9-e2f3f8ef77d0" elementId="979082d9-4cc9-4023-8cd9-e2f3f8ef77d0" body="This package contains definitions for metadata annotations related&#xA;to analysis tool integration.&#xA;"/>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:NamespaceImport" xmi:id="9f3d1e9e-79a6-447b-b09d-d84ce1776df7" elementId="9f3d1e9e-79a6-447b-b09d-d84ce1776df7" visibility="private">
<ownedRelationship xsi:type="sysml:NamespaceImport" xmi:id="ca4c6e6d-dedf-4605-b332-122b620e1697" elementId="ca4c6e6d-dedf-4605-b332-122b620e1697" visibility="private">
<importedNamespace href="../../Kernel%20Libraries/Kernel%20Data%20Type%20Library/ScalarValues.kermlx#40bb440c-5036-58e1-8675-5afccb8b8f1d"/>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="6de948f8-4580-4666-aa23-03d2c7fe689c" elementId="6de948f8-4580-4666-aa23-03d2c7fe689c">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="cbfd647b-715a-4c16-81a7-e740828c33a2" elementId="cbfd647b-715a-4c16-81a7-e740828c33a2">
<ownedRelatedElement xsi:type="sysml:MetadataDefinition" xmi:id="0159651d-d06c-586b-8811-22900cdc37c2" elementId="0159651d-d06c-586b-8811-22900cdc37c2" declaredName="ToolExecution">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="2cbe74da-2b64-476b-8b75-f9143a92ef18" elementId="2cbe74da-2b64-476b-8b75-f9143a92ef18">
<ownedRelatedElement xsi:type="sysml:Documentation" xmi:id="83b969fc-9971-4fa6-9c98-f9037af467ff" elementId="83b969fc-9971-4fa6-9c98-f9037af467ff" body="ToolExecution metadata identifies an external analysis tool to be&#xA;used to implement the annotated action.&#xA;"/>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="3eeea279-5411-47f4-bbf3-475b7f587273" elementId="3eeea279-5411-47f4-bbf3-475b7f587273">
<ownedRelatedElement xsi:type="sysml:Documentation" xmi:id="7bac4d2b-0e4d-431c-b29e-b4de2b6ce9ae" elementId="7bac4d2b-0e4d-431c-b29e-b4de2b6ce9ae" body="ToolExecution metadata identifies an external analysis tool to be&#xA;used to implement the annotated action.&#xA;"/>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="5dd64f2d-235e-4899-ac20-0d2459d2a9de" elementId="5dd64f2d-235e-4899-ac20-0d2459d2a9de">
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="36d28b9c-7d23-485f-bc10-af55c0c32eb6" elementId="36d28b9c-7d23-485f-bc10-af55c0c32eb6">
<ownedRelatedElement xsi:type="sysml:AttributeUsage" xmi:id="2baff8ef-aae1-57c9-838d-46abee0109e5" elementId="2baff8ef-aae1-57c9-838d-46abee0109e5" declaredName="toolName" isComposite="false">
<ownedRelationship xsi:type="sysml:FeatureTyping" xmi:id="086370b5-dfd1-4191-a435-48e4524e7a3d" elementId="086370b5-dfd1-4191-a435-48e4524e7a3d" typedFeature="2baff8ef-aae1-57c9-838d-46abee0109e5">
<ownedRelationship xsi:type="sysml:FeatureTyping" xmi:id="b8eed021-bfe0-4268-b5d9-b0ad8c376103" elementId="b8eed021-bfe0-4268-b5d9-b0ad8c376103" typedFeature="2baff8ef-aae1-57c9-838d-46abee0109e5">
<type href="../../Kernel%20Libraries/Kernel%20Data%20Type%20Library/ScalarValues.kermlx#76028d3d-69a4-5e12-9002-ce403e0244bd"/>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="d8a87ebd-f5df-4072-8a3e-6ed6c43a09fb" elementId="d8a87ebd-f5df-4072-8a3e-6ed6c43a09fb">
<ownedRelatedElement xsi:type="sysml:Multiplicity" xmi:id="917cd33e-52ce-4a17-b4dc-a438832e9c86" elementId="917cd33e-52ce-4a17-b4dc-a438832e9c86"/>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="298a9775-036c-42ad-a446-a5362c94ffc5" elementId="298a9775-036c-42ad-a446-a5362c94ffc5">
<ownedRelatedElement xsi:type="sysml:Multiplicity" xmi:id="3ab48a26-31a2-4190-bf92-1beeb02d61b3" elementId="3ab48a26-31a2-4190-bf92-1beeb02d61b3"/>
</ownedRelationship>
</ownedRelatedElement>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="f304497c-28b1-4f82-89ec-e0c6fb29a354" elementId="f304497c-28b1-4f82-89ec-e0c6fb29a354">
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="07cd13fc-76b8-42e5-9401-56f8e31fc336" elementId="07cd13fc-76b8-42e5-9401-56f8e31fc336">
<ownedRelatedElement xsi:type="sysml:AttributeUsage" xmi:id="6090146b-d46d-54cf-98ab-1772b53d6181" elementId="6090146b-d46d-54cf-98ab-1772b53d6181" declaredName="uri" isComposite="false">
<ownedRelationship xsi:type="sysml:FeatureTyping" xmi:id="b41b5dcd-b9f4-456f-b239-856a5b757a19" elementId="b41b5dcd-b9f4-456f-b239-856a5b757a19" typedFeature="6090146b-d46d-54cf-98ab-1772b53d6181">
<ownedRelationship xsi:type="sysml:FeatureTyping" xmi:id="2244ed39-704b-428f-a595-a2f854eca705" elementId="2244ed39-704b-428f-a595-a2f854eca705" typedFeature="6090146b-d46d-54cf-98ab-1772b53d6181">
<type href="../../Kernel%20Libraries/Kernel%20Data%20Type%20Library/ScalarValues.kermlx#76028d3d-69a4-5e12-9002-ce403e0244bd"/>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="0308ea48-7c0b-499b-b0d2-d698f409e773" elementId="0308ea48-7c0b-499b-b0d2-d698f409e773">
<ownedRelatedElement xsi:type="sysml:Multiplicity" xmi:id="8748d9df-e901-43bc-ab7f-3eca498d824e" elementId="8748d9df-e901-43bc-ab7f-3eca498d824e"/>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="9c3faca4-da22-4b75-a7e9-a224ef9a4ea8" elementId="9c3faca4-da22-4b75-a7e9-a224ef9a4ea8">
<ownedRelatedElement xsi:type="sysml:Multiplicity" xmi:id="48332668-eb6b-4631-a8b0-c8e222f7428b" elementId="48332668-eb6b-4631-a8b0-c8e222f7428b"/>
</ownedRelationship>
</ownedRelatedElement>
</ownedRelationship>
</ownedRelatedElement>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="d894a335-07b0-4de8-a970-a1d9de1bba0e" elementId="d894a335-07b0-4de8-a970-a1d9de1bba0e">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="8a622577-df2d-4b6b-a2fc-4c4182c63ae8" elementId="8a622577-df2d-4b6b-a2fc-4c4182c63ae8">
<ownedRelatedElement xsi:type="sysml:MetadataDefinition" xmi:id="faf363d5-40e8-5a6c-8a5e-ef0a2f2f56ed" elementId="faf363d5-40e8-5a6c-8a5e-ef0a2f2f56ed" declaredName="ToolVariable">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="c08c48cc-e35e-41a9-bb86-ed64bbb9cf39" elementId="c08c48cc-e35e-41a9-bb86-ed64bbb9cf39">
<ownedRelatedElement xsi:type="sysml:Documentation" xmi:id="7fbae17e-c521-4a79-8bcb-914f12f5655e" elementId="7fbae17e-c521-4a79-8bcb-914f12f5655e" body="ToolVariable metadata is used in the context of an action that has&#xA;been annotated with ToolExecution metadata. It is used to annotate&#xA;a parameter or other feature of the action with the name of the&#xA;variable in the tool that is to correspond to the annotated&#xA;feature.&#xA;"/>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="29c80aaf-4bac-4850-8387-69ab2115c332" elementId="29c80aaf-4bac-4850-8387-69ab2115c332">
<ownedRelatedElement xsi:type="sysml:Documentation" xmi:id="c43b3040-ba06-4eba-81e8-2bd0c0c03424" elementId="c43b3040-ba06-4eba-81e8-2bd0c0c03424" body="ToolVariable metadata is used in the context of an action that has&#xA;been annotated with ToolExecution metadata. It is used to annotate&#xA;a parameter or other feature of the action with the name of the&#xA;variable in the tool that is to correspond to the annotated&#xA;feature.&#xA;"/>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="df6e4ae3-4ead-4e02-949d-5c94e6767556" elementId="df6e4ae3-4ead-4e02-949d-5c94e6767556">
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="f27b6698-09ca-478e-9430-0b8c5d222b1b" elementId="f27b6698-09ca-478e-9430-0b8c5d222b1b">
<ownedRelatedElement xsi:type="sysml:AttributeUsage" xmi:id="5f513dd7-f2a0-5f5a-813f-9eaeb8dcaccd" elementId="5f513dd7-f2a0-5f5a-813f-9eaeb8dcaccd" declaredName="name" isComposite="false">
<ownedRelationship xsi:type="sysml:FeatureTyping" xmi:id="b719ecdd-0f2a-4b68-822d-3a5b56c8db45" elementId="b719ecdd-0f2a-4b68-822d-3a5b56c8db45" typedFeature="5f513dd7-f2a0-5f5a-813f-9eaeb8dcaccd">
<ownedRelationship xsi:type="sysml:FeatureTyping" xmi:id="b146dbf6-70cb-48c2-b99c-1d849d864307" elementId="b146dbf6-70cb-48c2-b99c-1d849d864307" typedFeature="5f513dd7-f2a0-5f5a-813f-9eaeb8dcaccd">
<type href="../../Kernel%20Libraries/Kernel%20Data%20Type%20Library/ScalarValues.kermlx#76028d3d-69a4-5e12-9002-ce403e0244bd"/>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="8fb7d9a2-fc5f-4040-91e3-1d38661f7bed" elementId="8fb7d9a2-fc5f-4040-91e3-1d38661f7bed">
<ownedRelatedElement xsi:type="sysml:Multiplicity" xmi:id="96faee96-ece7-4e01-b8dd-efe28bf02350" elementId="96faee96-ece7-4e01-b8dd-efe28bf02350"/>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="f9ff95f1-4dc3-4e4c-a2ef-1a240c177f3e" elementId="f9ff95f1-4dc3-4e4c-a2ef-1a240c177f3e">
<ownedRelatedElement xsi:type="sysml:Multiplicity" xmi:id="e47addc6-481f-4609-87e2-f6201eeb43eb" elementId="e47addc6-481f-4609-87e2-f6201eeb43eb"/>
</ownedRelationship>
</ownedRelatedElement>
</ownedRelationship>
Expand Down
Loading

0 comments on commit 444fb88

Please sign in to comment.