Skip to content

Commit

Permalink
Updated for 2022-11 (except for API & Services spec doc)
Browse files Browse the repository at this point in the history
  • Loading branch information
seidewitz committed Dec 16, 2022
1 parent aefe04e commit 727b37e
Show file tree
Hide file tree
Showing 18 changed files with 563 additions and 544 deletions.
Binary file modified doc/1-Kernel_Modeling_Language.pdf
Binary file not shown.
Binary file modified doc/2-OMG_Systems_Modeling_Language.pdf
Binary file not shown.
Binary file modified doc/2C-SysML_v1_to_v2_Transformation.pdf
Binary file not shown.
Binary file modified doc/Intro to the SysML v2 Language-Textual Notation.pdf
Binary file not shown.
6 changes: 3 additions & 3 deletions install/eclipse/README.adoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
= SysML v2 Release Eclipse Installation

*Requirements:* Eclipse 2021-09 (4.21), with Java Development Kit
*Requirements:* Eclipse 2022-09 (4.25), with Java Development Kit

(*Note:* The release may work on later versions of Eclipse, but it has only been tested on 2021-09.)
(*Note:* The release may work on later versions of Eclipse, but it has only been tested on 2022-09.)

== Installing the plugins

Expand All @@ -20,7 +20,7 @@ Graphical visualization is available in Eclipse using the open source https://pl
. Make sure that your Eclipse has PlantUML with SysMLv2 extensions. You can install it from the update site of https://github.com/himi/p2-update-puml-sysmlv2/raw/main/updates with Help > Install New Software
. PlantUML visualization requires that https://www.graphviz.org[GraphViz] be installed. Visit https://www.graphviz.org/download/
and download the appropriate package for your environment.
** The recommended GraphViz version is 2.44.1. Make sure you have initialized GraphViz with `dot -c` command. See https://plantuml.com/en/graphviz-dot for details.
** The recommended GraphViz version is 2.44.1. Make sure you have initialized GraphViz with `dot -c` command. See https://plantuml.com/ja/graphviz-dot for details.
. If Eclipse cannot automatically find the path to the GraphViz executable, you can set it by going to `Preferences > PlantUML`.
For details, visit https://plantuml.com/en/eclipse.

Expand Down
Binary file modified install/eclipse/README.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 @@ -20,7 +20,7 @@

@echo off

set /A SYSML_VERSION="0.29.0"
set /A SYSML_VERSION="0.30.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 @@ -21,7 +21,7 @@

set -e

SYSML_VERSION="0.29.0"
SYSML_VERSION="0.30.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
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ standard library package StateSpaceRepresentation {
* commonly used in control systems.
*/

import ISQ::DurationValue;
import Quantities::VectorQuantityValue;
import VectorCalculations::*;
private import ISQ::DurationValue;
private import Quantities::VectorQuantityValue;
private import VectorCalculations::*;

abstract attribute def StateSpace :> VectorQuantityValue;
abstract attribute def Input :> VectorQuantityValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ standard library package CausationConnections {
* between them.
*/

private import SequenceFunctions::isEmpty;
private import SequenceFunctions::size;
private import SequenceFunctions::intersection;

abstract occurrence causes[*] {
doc /* Occurrences that are causes. */
}
Expand All @@ -25,8 +29,6 @@ standard library package CausationConnections {
* There must be at least one cause and at least one effect.
*/

private import SequenceFunctions::*;

ref occurrence causes[1..*] :>> causes :> participant {
doc /* The causing occurrences. */
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ standard library package ImageMetadata {
* adorn graphical or textual renderings.
*/

import ScalarValues::String;
private import ScalarValues::String;

attribute def Image {
doc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ standard library package ParametersOfInterestMetadata {
* including measures of effectiveness (MOE) and other key measures of performance (MOP).
*/

import Metaobjects::SemanticMetadata;
private import Metaobjects::SemanticMetadata;

attribute measuresOfEffectiveness[*] nonunique {
doc /* Base feature for attributes that are measures of effectiveness. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ standard library package DerivationConnections {
/*
* This package provides a library model for derivation connections between requirements.
*/

private import SequenceFunctions::excludes;
private import ControlFunctions::allTrue;

requirement originalRequirements[*] {
doc /* originalRequirements are the original requirements in Derivation connections. */
Expand Down Expand Up @@ -38,7 +41,7 @@ standard library package DerivationConnections {
private assert constraint originalNotDerived {
doc /* The original requirement must not be a derived requirement. */

derivedRequirements->SequenceFunctions::excludes(originalRequirement)
derivedRequirements->excludes(originalRequirement)
}

private assert constraint originalImpliesDerived {
Expand All @@ -48,7 +51,7 @@ standard library package DerivationConnections {
* be satisfied.
*/

originalRequirement.result implies ControlFunctions::allTrue(derivedRequirements.result)
originalRequirement.result implies allTrue(derivedRequirements.result)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ standard library package RequirementDerivation {
doc /* This package provides language-extension metadata for modeling requirement derivation. */

import DerivationConnections::*;
import Metaobjects::SemanticMetadata;
private import Metaobjects::SemanticMetadata;

metadata def <original> OriginalRequirementMetadata :> SemanticMetadata {
doc
Expand All @@ -12,7 +12,7 @@ standard library package RequirementDerivation {
*/

:> annotatedElement : SysML::Usage;
:>> baseType = derivedRequirements meta SysML::Usage;
:>> baseType = originalRequirements meta SysML::Usage;
}

metadata def <derive> DerivedRequirementMetadata :> SemanticMetadata {
Expand All @@ -23,7 +23,7 @@ standard library package RequirementDerivation {
*/

:> annotatedElement : SysML::Usage;
:>> baseType = originalRequirements meta SysML::Usage;
:>> baseType = derivedRequirements meta SysML::Usage;
}

metadata def <derivation> DerivationMetadata :> SemanticMetadata {
Expand Down
13 changes: 10 additions & 3 deletions sysml.library/Kernel Libraries/Kernel Semantic Library/KerML.kerml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,13 @@ standard library package KerML {
derived feature textualRepresentation : TextualRepresentation[0..*] subsets ownedElement;
}

metaclass Import specializes Relationship {
abstract metaclass Import specializes Relationship {
feature visibility : VisibilityKind[1..1];
feature importedMemberName : String[0..1];
feature isRecursive : Boolean[1..1];
feature isImportAll : Boolean[1..1];

feature importedNamespace : Namespace[1..1] redefines target;
derived feature importOwningNamespace : Namespace[1..1] subsets owningRelatedElement redefines source;
derived feature importedElement : Element[1..1];
}

metaclass Membership specializes Relationship {
Expand All @@ -69,6 +68,10 @@ standard library package KerML {
derived feature membershipOwningNamespace : Namespace[1..1] subsets owningRelatedElement redefines source;
}

metaclass MembershipImport specializes Import {
feature importedMembership : Membership[1..1] redefines target;
}

metaclass Namespace specializes Element {
abstract derived feature membership : Membership[0..*];
composite derived feature ownedImport : Import[0..*] subsets ownedRelationship;
Expand All @@ -78,6 +81,10 @@ standard library package KerML {
derived feature importedMembership : Membership[0..*] subsets membership;
}

metaclass NamespaceImport specializes Import {
feature importedNamespace : Namespace[1..1] redefines target;
}

metaclass OwningMembership specializes Membership {
derived feature ownedMemberElementId : String[1..1] redefines memberElementId;
derived feature ownedMemberShortName : String[0..1] redefines memberShortName;
Expand Down
Loading

0 comments on commit 727b37e

Please sign in to comment.