Skip to content

Commit

Permalink
Updated for 2024-01.
Browse files Browse the repository at this point in the history
  • Loading branch information
seidewitz committed Feb 7, 2024
1 parent 17ac28d commit 2c400a9
Show file tree
Hide file tree
Showing 115 changed files with 114,063 additions and 113,806 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.37.0"
set SYSML_VERSION="0.38.0"

echo --- Step 1: Testing Conda installation ---
where conda
Expand Down
4 changes: 2 additions & 2 deletions install/jupyter/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SysML 2 Pilot Implementation
# Copyright (C) 2020 California Institute of Technology ("Caltech")
# Copyright (C) 2021 Twingineer LLC
# Copyright (C) 2023 Model Driven Solutions, Inc.
# Copyright (C) 2021 Model Driven Solutions, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
Expand All @@ -22,7 +22,7 @@

set -e

SYSML_VERSION="0.37.0"
SYSML_VERSION="0.38.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: 5 additions & 1 deletion kerml/src/examples/Simple Tests/Classes.kerml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package Classes {
public class <'1'> A {
feature b: B;
protected in c: C;
portion feature p : A;
}

abstract class <'2'> B {
Expand All @@ -13,7 +14,10 @@ package Classes {
}
public composite feature a1: A;
feature x {
composite feature a: A;
composite feature a: A {
portion feature q : A;
}
portion feature q : A;
}
package P { }
}
Expand Down
3 changes: 2 additions & 1 deletion kerml/src/examples/Simple Tests/Connectors.kerml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ package Connectors {
feature b : A;

connector c1 from a to b;
connector c2 {
abstract connector c2 = c1;
connector = c2 {
end feature references a;
end feature references b;
}
Expand Down
46 changes: 23 additions & 23 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="5f66db0c-9fa4-476e-888c-a2006085456a" elementId="5f66db0c-9fa4-476e-888c-a2006085456a">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="d6e92204-e797-485b-9e8f-740eef164168" elementId="d6e92204-e797-485b-9e8f-740eef164168">
<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="070d065b-4cc6-4793-9268-0a7201b9f994" elementId="070d065b-4cc6-4793-9268-0a7201b9f994">
<ownedRelatedElement xsi:type="sysml:Documentation" xmi:id="f5661009-8c06-418f-92ac-0a7fe55edfe6" elementId="f5661009-8c06-418f-92ac-0a7fe55edfe6" body="This package contains definitions for metadata annotations related&#xA;to analysis tool integration.&#xA;"/>
<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;"/>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:NamespaceImport" xmi:id="a2782676-dcea-42ba-8d0a-d2706fc8ea5a" elementId="a2782676-dcea-42ba-8d0a-d2706fc8ea5a" visibility="private">
<ownedRelationship xsi:type="sysml:NamespaceImport" xmi:id="9f3d1e9e-79a6-447b-b09d-d84ce1776df7" elementId="9f3d1e9e-79a6-447b-b09d-d84ce1776df7" 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="fd2c6ffa-86a6-43be-9f81-b6459b866d68" elementId="fd2c6ffa-86a6-43be-9f81-b6459b866d68">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="6de948f8-4580-4666-aa23-03d2c7fe689c" elementId="6de948f8-4580-4666-aa23-03d2c7fe689c">
<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="1dc224d3-4519-4f12-ac99-3105b1eb8381" elementId="1dc224d3-4519-4f12-ac99-3105b1eb8381">
<ownedRelatedElement xsi:type="sysml:Documentation" xmi:id="55e690df-d432-45a5-aee5-043b41b34fe7" elementId="55e690df-d432-45a5-aee5-043b41b34fe7" 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="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>
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="9c5a502b-4807-4a93-b6f0-da0800e08fbd" elementId="9c5a502b-4807-4a93-b6f0-da0800e08fbd">
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="5dd64f2d-235e-4899-ac20-0d2459d2a9de" elementId="5dd64f2d-235e-4899-ac20-0d2459d2a9de">
<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="6b8874f5-a960-43b4-ae9e-d707a8caaba2" elementId="6b8874f5-a960-43b4-ae9e-d707a8caaba2" typedFeature="2baff8ef-aae1-57c9-838d-46abee0109e5">
<ownedRelationship xsi:type="sysml:FeatureTyping" xmi:id="086370b5-dfd1-4191-a435-48e4524e7a3d" elementId="086370b5-dfd1-4191-a435-48e4524e7a3d" 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="635bb5a9-800c-457f-8433-fff623b436b8" elementId="635bb5a9-800c-457f-8433-fff623b436b8">
<ownedRelatedElement xsi:type="sysml:Multiplicity" xmi:id="10db5483-8d63-4f8c-91dc-cc0e4061e084" elementId="10db5483-8d63-4f8c-91dc-cc0e4061e084"/>
<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>
</ownedRelatedElement>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="1e018034-95e8-4884-8e1a-9e483e24fd31" elementId="1e018034-95e8-4884-8e1a-9e483e24fd31">
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="f304497c-28b1-4f82-89ec-e0c6fb29a354" elementId="f304497c-28b1-4f82-89ec-e0c6fb29a354">
<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="94f5eb9c-2e17-41e1-917c-55e636552a74" elementId="94f5eb9c-2e17-41e1-917c-55e636552a74" typedFeature="6090146b-d46d-54cf-98ab-1772b53d6181">
<ownedRelationship xsi:type="sysml:FeatureTyping" xmi:id="b41b5dcd-b9f4-456f-b239-856a5b757a19" elementId="b41b5dcd-b9f4-456f-b239-856a5b757a19" 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="311b355b-3ba1-4d35-8455-03614a9ea25d" elementId="311b355b-3ba1-4d35-8455-03614a9ea25d">
<ownedRelatedElement xsi:type="sysml:Multiplicity" xmi:id="63c6e16c-68cd-467c-b7f2-639097a07831" elementId="63c6e16c-68cd-467c-b7f2-639097a07831"/>
<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>
</ownedRelatedElement>
</ownedRelationship>
</ownedRelatedElement>
</ownedRelationship>
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="e8703e73-e840-4fa3-b22a-95da0e589834" elementId="e8703e73-e840-4fa3-b22a-95da0e589834">
<ownedRelationship xsi:type="sysml:OwningMembership" xmi:id="d894a335-07b0-4de8-a970-a1d9de1bba0e" elementId="d894a335-07b0-4de8-a970-a1d9de1bba0e">
<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="b62fe99c-9913-4f27-8d69-6d6888dde3c1" elementId="b62fe99c-9913-4f27-8d69-6d6888dde3c1">
<ownedRelatedElement xsi:type="sysml:Documentation" xmi:id="60b98516-a1f5-420b-a715-710a1d9789d8" elementId="60b98516-a1f5-420b-a715-710a1d9789d8" 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="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>
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="ed74f048-829d-48c1-9fec-f650c25d6aba" elementId="ed74f048-829d-48c1-9fec-f650c25d6aba">
<ownedRelationship xsi:type="sysml:FeatureMembership" xmi:id="df6e4ae3-4ead-4e02-949d-5c94e6767556" elementId="df6e4ae3-4ead-4e02-949d-5c94e6767556">
<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="90aebb44-4276-4eed-875a-1483b61d3c9b" elementId="90aebb44-4276-4eed-875a-1483b61d3c9b" typedFeature="5f513dd7-f2a0-5f5a-813f-9eaeb8dcaccd">
<ownedRelationship xsi:type="sysml:FeatureTyping" xmi:id="b719ecdd-0f2a-4b68-822d-3a5b56c8db45" elementId="b719ecdd-0f2a-4b68-822d-3a5b56c8db45" 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="2187013e-a9b6-44bf-b687-3bf52197f5c3" elementId="2187013e-a9b6-44bf-b687-3bf52197f5c3">
<ownedRelatedElement xsi:type="sysml:Multiplicity" xmi:id="dac2ffe1-7c6e-436a-92a3-9090c24af868" elementId="dac2ffe1-7c6e-436a-92a3-9090c24af868"/>
<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>
</ownedRelatedElement>
</ownedRelationship>
Expand Down
Loading

0 comments on commit 2c400a9

Please sign in to comment.