Skip to content

Commit

Permalink
Updated for 2023-07.
Browse files Browse the repository at this point in the history
  • Loading branch information
seidewitz committed Aug 2, 2023
1 parent 9b2d08a commit 4a6e1ef
Show file tree
Hide file tree
Showing 16 changed files with 57 additions and 38 deletions.
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.33.0"
set /A SYSML_VERSION="0.34.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.33.0"
SYSML_VERSION="0.34.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
4 changes: 4 additions & 0 deletions kerml/src/examples/Simple Tests/Circular.kerml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ package Circular {
package P {
import Circular::*;
}

feature x :> z;
feature y :> x;
feature z :> y;
}
10 changes: 8 additions & 2 deletions kerml/src/examples/Simple Tests/Connectors.kerml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ package Connectors {
feature a : A;
feature b : A;

connector from a to b;
connector {
connector c1 from a to b;
abstract connector c2 = c;
connector = c2 {
end feature references a;
end feature references b;
}
Expand All @@ -24,4 +25,9 @@ package Connectors {
end feature references b;
}
}

class B {
feature a : A;
connector :> a.c1 from a.a to a.b;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ standard library package CausationConnections {
* connections with multiple causes.)
*/

end occurrence theCause[*] :>> causes :> source {
end occurrence theCause[*] :>> causes :>> source {
doc /* The single causing occurrence. */
}

end occurrence theEffect[*] :>> effects :> target {
end occurrence theEffect[*] :>> effects :>> target {
doc /* The single effect occurrence resulting from the cause. */
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,11 @@ standard library package Transfers {
interaction FlowTransferBefore specializes FlowTransfer, TransferBefore {
doc
/*
* FlowTransferbefore is a FlowTransfer that is also a TransferBefore.
* FlowTransferBefore is a FlowTransfer that is also a TransferBefore.
*/

end feature source: Occurrence[0..*] redefines Transfer::source, TransferBefore::source;
end feature target: Occurrence[0..*] redefines Transfer::target, TransferBefore::target;
}

step transfers: Transfer[0..*] nonunique subsets performances, binaryLinks {
Expand Down
12 changes: 6 additions & 6 deletions sysml.library/Systems Library/Connections.sysml
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ standard library package Connections {
* messageConnections is the base feature of all FlowConnectionUsages.
*/

end source: Occurrence[0..*] :>> MessageConnection::source, binaryConnections::source, transfers::source;
end target: Occurrence[0..*] :>> MessageConnection::target, binaryConnections::target, transfers::target;
end occurrence source: Occurrence[0..*] :>> MessageConnection::source, binaryConnections::source, transfers::source;
end occurrence target: Occurrence[0..*] :>> MessageConnection::target, binaryConnections::target, transfers::target;
}

abstract message flowConnections: FlowConnection[0..*] nonunique :> messageConnections, flowTransfers {
Expand All @@ -134,8 +134,8 @@ standard library package Connections {
* and target input.
*/

end source: Occurrence[0..*] :>> FlowConnection::source, messageConnections::source, flowTransfers::source;
end target: Occurrence[0..*] :>> FlowConnection::target, messageConnections::target, flowTransfers::target;
end occurrence source: Occurrence[0..*] :>> FlowConnection::source, messageConnections::source, flowTransfers::source;
end occurrence target: Occurrence[0..*] :>> FlowConnection::target, messageConnections::target, flowTransfers::target;
}

abstract message successionFlowConnections: SuccessionFlowConnection[0..*] nonunique :> flowConnections, flowTransfersBefore {
Expand All @@ -144,7 +144,7 @@ standard library package Connections {
* successionFlowConnections is the base feature of all SuccessionFlowConnectionUsages.
*/

end source: Occurrence[0..*] :>> SuccessionFlowConnection::source, flowConnections::source, flowTransfersBefore::source;
end target: Occurrence[0..*] :>> SuccessionFlowConnection::target, flowConnections::target, flowTransfersBefore::target;
end occurrence source: Occurrence[0..*] :>> SuccessionFlowConnection::source, flowConnections::source, flowTransfersBefore::source;
end occurrence target: Occurrence[0..*] :>> SuccessionFlowConnection::target, flowConnections::target, flowTransfersBefore::target;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ package AHFNorway {
#servicedd port def APIS_DD :> APISService {
doc /* Service design description with nested protocol-specific ports */

#idd APIS_HTTP {
#idd port APIS_HTTP {
// the asynch implementation of synchronous remote calls
out cll:CallGiveItems;
in retrn:ResultGiveItems;
}

#idd APIS_MQTT {
#idd port APIS_MQTT {
// GetAllItems functionality
out pub:Publish;
out retall:Return_AllItems;
Expand Down Expand Up @@ -57,7 +57,7 @@ package AHFNorway {
// Call apisp::APIS_HTTP::giveItems(in allitems: String = "All the items", out ackback:Boolean);

state TellUbehavior{
entry send CallGiveItems("All the items") to apisp.APIS_HTTP;
entry send CallGiveItems("All the items") via apisp.APIS_HTTP;
then Wait;
state Wait;
accept rs:ResultGiveItems
Expand All @@ -81,21 +81,21 @@ package AHFNorway {
{ in itms:String; out ack:Boolean;
/* Forward itms and return an ack */
first start;
then send Return_AllItems(itms) to apisc.APIS_MQTT;
then send Return_AllItems(itms) via apisc.APIS_MQTT;
success = true;
bind ack = success;
}

state APISPbehavior{
entry send Publish("Return_AllItems") to apisc.APIS_MQTT;
entry send Publish("Return_AllItems") via apisc.APIS_MQTT;
then WaitOnData;

state WaitOnData;
accept cl:CallGiveItems via tellu.APIS_HTTP
do action {
first start;
then action giveItems{ in itms=cl.itms; out ack=x; }
then send ResultGiveItems(x) to tellu.APIS_HTTP;
then send ResultGiveItems(x) via tellu.APIS_HTTP;
}
then WaitOnData;
}
Expand All @@ -110,7 +110,7 @@ package AHFNorway {

// Now sending signal to the remote behavior through the port functionality
state MQTT_APISP {
entry send Subscribe("Return_AllItems") to apisp.APIS_MQTT;
entry send Subscribe("Return_AllItems") via apisp.APIS_MQTT;
then Idle;
state Idle;
accept Return_AllItems via apisp.APIS_MQTT
Expand Down Expand Up @@ -138,7 +138,7 @@ package AHFNorway {

state Idle;
accept retrnall:Return_AllItems via getTopic.APIS_MQTT
do send retrnall to giveTopic.APIS_MQTT
do send retrnall via giveTopic.APIS_MQTT
then Idle;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ package 'Flashlight Example' {
}

interface userToFlashlight connect user.onOffCmdPort to flashlight.onOffCmdPort {
ref flow :> illuminateRegion.onOffCmdFlow
from source.onOffCmd to target.onOffCmd;
ref flow references illuminateRegion.onOffCmdFlow
from source.onOffCmd to target.onOffCmd;
}

part flashlight {
Expand Down
12 changes: 6 additions & 6 deletions sysml/src/examples/Simple Tests/ConjugationTest.sysml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ package ConjugationTest {
port p2: ~P;
}

connection a: A connect p.p1 to p.p2 {
end port p3: P;
end port p4: ~P;
connection a: A {
end port p3: P ::> p.p1;
end port p4: ~P ::> p.p2;
}
interface i: I connect p.p1 to p.p2 {
end port p3: P;
end port p4: ~P;
interface i: I {
end port p3: P ::> p.p1;
end port p4: ~P ::> p.p2;
}
}

Expand Down
4 changes: 2 additions & 2 deletions sysml/src/examples/Simple Tests/ConnectionTest.sysml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ package ConnectionTest {
}

flow def F {
end p : P;
end q;
end f_p : P;
end f_q;
}

message : F from p to p;
Expand Down
6 changes: 6 additions & 0 deletions sysml/src/examples/Simple Tests/PartTest.sysml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,10 @@ package PartTest {
alias z2 for y;
}

part p1 :> p2;
part p2 :> p3;
part p3 :> p1;

part p4 :> p4;

}
Original file line number Diff line number Diff line change
Expand Up @@ -1501,10 +1501,10 @@ package SimpleVehicleModel{
}
}
}
// varaition point based on variation of part definition
variation part transmissionChoices:TransmissionChoices;
// variation point based on variation of part definition
part transmissionChoices:TransmissionChoices;
// optional variation point
variation part sunroof:Sunroof;
part sunroof:Sunroof[0..1];
// selection constraint
assert constraint selectionConstraint{
(engine==engine::engine4Cyl and transmissionChoices==TransmissionChoices::transmissionManual) xor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,23 +162,23 @@ package '14c-Language-Extensions' {

#prevention connect 'battery depleted' to req1;

#cause 'battery depleted' {
#cause occurrence 'battery depleted' {
:>> occurs = 0.005;
}

#causation first 'battery depleted' then 'battery cannot be charged';

#failure 'battery cannot be charged' {
#failure occurrence 'battery cannot be charged' {
:>> detected = 0.013;
}

#causation first 'battery cannot be charged' then 'glucose level undetected';

#effect 'glucose level undetected';
#effect occurrence 'glucose level undetected';

#causation first 'glucose level undetected' then 'therapy delay';

#effect 'therapy delay' {
#effect occurrence 'therapy delay' {
:>> severity = "High";
}

Expand Down

0 comments on commit 4a6e1ef

Please sign in to comment.