Skip to content

Commit

Permalink
Updated for 2024-07.
Browse files Browse the repository at this point in the history
  • Loading branch information
seidewitz committed Aug 8, 2024
1 parent 8919858 commit 852d381
Show file tree
Hide file tree
Showing 326 changed files with 114,418 additions and 114,460 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.42.0"
set SYSML_VERSION="0.43.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.42.0"
SYSML_VERSION="0.43.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
@@ -1,4 +1,4 @@
import ScalarValues::*;
private import ScalarValues::*;
package AddressBookModel {

class Entry {
Expand Down
8 changes: 3 additions & 5 deletions kerml/src/examples/Behavior Examples/Camera.kerml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
class Camera {
import Base::*;
import ScalarValues::*;
import Occurrences::*;
private import ScalarValues::*;

portion focusedState: Camera subsets Occurrence::timeSlices;
portion shotState: Camera subsets Occurrence::timeSlices;
portion focusedState: Camera subsets timeSlices;
portion shotState: Camera subsets timeSlices;

succession focusedState then shotState;
}
3 changes: 1 addition & 2 deletions kerml/src/examples/Behavior Examples/TakePicture.kerml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
behavior TakePicture {
import Base::*;
import Camera;
private import Camera;

feature camera: Camera[1] subsets involvedObjects;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package JohnIndividualExample {
import Objects::*;
private import Objects::*;

class Person specializes Object {
doc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package ModelingInstancesWithAtoms {
/*
*/

import Atoms::atom;
private import Atoms::atom;

classifier Vehicle;
classifier Bicycle specializes Vehicle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package WithoutConnectorsExecution {
/*
*/

import Atoms::*;
import WithoutConnectorsModelToBeExecuted::*;
private import Atoms::*;
private import WithoutConnectorsModelToBeExecuted::*;

#atom
classifier MyWheel1 specializes Wheel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package OneToOneConnectorsModelToBeExecuted {
/*
*/

import WithoutConnectorsModelToBeExecuted::Wheel;
import WithoutConnectorsModelToBeExecuted::BikeFork;
public import WithoutConnectorsModelToBeExecuted::Wheel;
public import WithoutConnectorsModelToBeExecuted::BikeFork;

classifier Bicycle {
feature rollsOn : Wheel [2];
Expand All @@ -23,11 +23,11 @@ package OneToOneConnectorsExecution {
/*
*/

import Atoms::*;
import OneToOneConnectorsModelToBeExecuted::*;
import WithoutConnectorsExecution::MyWheel1;
import WithoutConnectorsExecution::MyWheel2;
import WithoutConnectorsExecution::MyWheel;
private import Atoms::*;
public import OneToOneConnectorsModelToBeExecuted::*;
public import WithoutConnectorsExecution::MyWheel1;
public import WithoutConnectorsExecution::MyWheel2;
public import WithoutConnectorsExecution::MyWheel;

#atom
classifier MyBikeFork1 specializes BikeFork;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package OneToUnrestrictedConnectorsModelToBeExecuted {
/*
*/

import WithoutConnectorsModelToBeExecuted::BikeFork;
private import WithoutConnectorsModelToBeExecuted::BikeFork;

classifier Bicycle {
feature carrier : BikeBasket [*];
Expand All @@ -24,11 +24,11 @@ package OneToUnrestrictedConnectorsExecution {
/*
*/

import Atoms::*;
import OneToUnrestrictedConnectorsModelToBeExecuted::*;
import OneToOneConnectorsExecution::MyBikeFork1;
import OneToOneConnectorsExecution::MyBikeFork2;
import OneToOneConnectorsExecution::MyBikeFork;
private import Atoms::*;
private import OneToUnrestrictedConnectorsModelToBeExecuted::*;
private import OneToOneConnectorsExecution::MyBikeFork1;
private import OneToOneConnectorsExecution::MyBikeFork2;
private import OneToOneConnectorsExecution::MyBikeFork;

#atom
classifier MyBikeBasket1 specializes BikeBasket;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package TimingForStructuresModelToBeExecuted1 {
/*
*/

import WithoutConnectorsModelToBeExecuted::Wheel;
import WithoutConnectorsModelToBeExecuted::BikeFork;
import Occurrences::Occurrence;
private import WithoutConnectorsModelToBeExecuted::Wheel;
private import WithoutConnectorsModelToBeExecuted::BikeFork;
private import Occurrences::Occurrence;

struct Bicycle {
feature rollsOn : Wheel [2] subsets timeCoincidentOccurrences;
Expand All @@ -19,10 +19,10 @@ package TimingForStructuresExecution1 {
/*
*/

import Atoms::*;
import TimingForStructuresModelToBeExecuted1::*;
import OneToOneConnectorsExecution::MyWheel;
import OneToOneConnectorsExecution::MyBikeFork;
private import Atoms::*;
private import TimingForStructuresModelToBeExecuted1::*;
private import OneToOneConnectorsExecution::MyWheel;
private import OneToOneConnectorsExecution::MyBikeFork;

struct MyBikeTimeCoincident unions MyWheel, MyBikeFork, MyBike;

Expand All @@ -41,10 +41,10 @@ package TimingForStructuresModelToBeExecuted2 {
/*
*/

import WithoutConnectorsModelToBeExecuted::Wheel;
import WithoutConnectorsModelToBeExecuted::BikeFork;
import Occurrences::Occurrence;
import Occurrences::HappensDuring;
private import WithoutConnectorsModelToBeExecuted::Wheel;
private import WithoutConnectorsModelToBeExecuted::BikeFork;
private import Occurrences::Occurrence;
private import Occurrences::HappensDuring;

struct Bicycle {
feature rollsOn : Wheel [2];
Expand All @@ -59,15 +59,15 @@ package TimingForStructuresExecution2 {
/*
*/

import Atoms::*;
import TimingForStructuresModelToBeExecuted2::*;
import Occurrences::HappensDuring;
import OneToOneConnectorsExecution::MyWheel1;
import OneToOneConnectorsExecution::MyWheel2;
import OneToOneConnectorsExecution::MyWheel;
import OneToOneConnectorsExecution::MyBikeFork1;
import OneToOneConnectorsExecution::MyBikeFork2;
import OneToOneConnectorsExecution::MyBikeFork;
private import Atoms::*;
private import TimingForStructuresModelToBeExecuted2::*;
private import Occurrences::HappensDuring;
private import OneToOneConnectorsExecution::MyWheel1;
private import OneToOneConnectorsExecution::MyWheel2;
private import OneToOneConnectorsExecution::MyWheel;
private import OneToOneConnectorsExecution::MyBikeFork1;
private import OneToOneConnectorsExecution::MyBikeFork2;
private import OneToOneConnectorsExecution::MyBikeFork;

#atom
assoc MyBike_During_Wheel1_Link specializes HappensDuring {
Expand Down Expand Up @@ -113,10 +113,10 @@ package TimingForStructuresModelToBeExecuted3 {
/*
*/

import WithoutConnectorsModelToBeExecuted::Wheel;
import WithoutConnectorsModelToBeExecuted::BikeFork;
import Occurrences::Occurrence;
import Occurrences::HappensWhile;
private import WithoutConnectorsModelToBeExecuted::Wheel;
private import WithoutConnectorsModelToBeExecuted::BikeFork;
private import Occurrences::Occurrence;
private import Occurrences::HappensWhile;

struct Bicycle {
feature rollsOn : Wheel [2];
Expand All @@ -132,12 +132,12 @@ package TimingForStructuresExecution3 {
/*
*/

import Atoms::*;
import TimingForStructuresModelToBeExecuted3::*;
import Occurrences::Occurrence;
import Occurrences::HappensWhile;
import WithoutConnectorsModelToBeExecuted::Wheel;
import WithoutConnectorsModelToBeExecuted::BikeFork;
private import Atoms::*;
private import TimingForStructuresModelToBeExecuted3::*;
private import Occurrences::Occurrence;
private import Occurrences::HappensWhile;
private import WithoutConnectorsModelToBeExecuted::Wheel;
private import WithoutConnectorsModelToBeExecuted::BikeFork;

/* End atoms */
#atom
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ package SequencesExecution {
/*
*/

import Atoms::*;
import SequencesModelToBeExecuted::*;
import Occurrences::Occurrence;
import Occurrences::HappensBefore;
private import Atoms::*;
private import SequencesModelToBeExecuted::*;
private import Occurrences::Occurrence;
private import Occurrences::HappensBefore;

#atom
behavior MyPaint specializes Paint;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ package DecisionsAndMergesModelToBeExecuted {
/*
*/

import ControlPerformances::DecisionPerformance;
import ControlPerformances::MergePerformance;
import Occurrences::HappensBefore;
import Links::SelfLink;
private import ControlPerformances::DecisionPerformance;
private import ControlPerformances::MergePerformance;
private import Occurrences::HappensBefore;
private import Links::SelfLink;

behavior Manufacture {
/* Before decision. */
Expand Down Expand Up @@ -51,10 +51,12 @@ package DecisionsAndMergesExecution {
/*
*/

import Atoms::*;
import DecisionsAndMergesModelToBeExecuted::*;
import Occurrences::Occurrence;
import Occurrences::HappensBefore;
private import Atoms::*;
private import DecisionsAndMergesModelToBeExecuted::*;
private import Occurrences::Occurrence;
private import Occurrences::HappensBefore;
private import ControlPerformances::DecisionPerformance;
private import ControlPerformances::MergePerformance;

/* Before decision. */
#atom
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package ChangingFeatureValuesModelToBeExecuted {
/*
*/

import ScalarValues::Boolean;
import FeatureReferencingPerformances::FeatureWritePerformance;
private import ScalarValues::Boolean;
private import FeatureReferencingPerformances::FeatureWritePerformance;

behavior Manufacture {
feature objectToFinish : Product [1];
Expand Down Expand Up @@ -73,10 +73,11 @@ package ChangingFeatureValuesExecution {
/*
*/

import Atoms::*;
import ChangingFeatureValuesModelToBeExecuted::*;
import Occurrences::Occurrence;
import Occurrences::HappensBefore;
private import Atoms::*;
private import ChangingFeatureValuesModelToBeExecuted::*;
private import Occurrences::Occurrence;
private import Occurrences::HappensBefore;
private import FeatureReferencingPerformances::FeatureWritePerformance;

struct ProductTimeSlice specializes Product {
readonly feature redefines isPainted;
Expand Down
2 changes: 1 addition & 1 deletion kerml/src/examples/Mass Roll-up Example/MassRollup_1.kerml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package MassRollup_1 {
import NumericalFunctions::*;
private import NumericalFunctions::*;

class MassedThing {
feature mass : ScalarValues::Real;
Expand Down
4 changes: 2 additions & 2 deletions kerml/src/examples/Mass Roll-up Example/MassRollup_2.kerml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package MassRollup_2 {
import NumericalFunctions::*;
import ISQ::*;
private import NumericalFunctions::*;
private import ISQ::*;

class MassedThing {
feature mass : ScalarValues::Real;
Expand Down
5 changes: 3 additions & 2 deletions kerml/src/examples/Mass Roll-up Example/Vehicles_1.kerml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package Vehicles_1 {
import MassRollup_1::*;
private import ScalarValues::String;
private import MassRollup_1::*;

class Vehicle specializes MassedThing {
feature vin: String;
Expand All @@ -25,7 +26,7 @@ package Vehicles_1 {

// Example usage

import SI::*;
private import SI::*;
feature v: Vehicle {
feature m redefines Vehicle::m = 1000;
composite engine redefines Vehicle::engine {
Expand Down
5 changes: 3 additions & 2 deletions kerml/src/examples/Mass Roll-up Example/Vehicles_2.kerml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package Vehicles_2 {
import MassRollup_1::*;
private import ScalarValues::String;
private import MassRollup_1::*;

class CarPart specializes MassedThing {
feature serialNumber: String;
Expand All @@ -22,7 +23,7 @@ package Vehicles_2 {

// Example usage

import SI::*;
private import SI::*;
feature v: vehicle {
feature m redefines CarPart::m = 1000;
composite engine redefines vehicle::engine {
Expand Down
6 changes: 3 additions & 3 deletions kerml/src/examples/Mass Roll-up Example/Vehicles_3.kerml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package Vehicles_3 {
import ScalarValues::*;
import MassRollup_2::*;
private import ScalarValues::*;
private import MassRollup_2::*;

class CarPart specializes MassedThing {
feature serialNumber: String;
Expand Down Expand Up @@ -28,7 +28,7 @@ package Vehicles_3 {

// Example usage

import SI::*;
private import SI::*;
feature v: vehicle {
feature m redefines CarPart::m = 1000;
composite :>> engine = e;
Expand Down
2 changes: 1 addition & 1 deletion kerml/src/examples/Massed Thing Example/MassedThings.kerml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ScalarValues::*;
private import ScalarValues::*;
package MassedThings {

public class MassedThing {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package VehicleTanks {
import ScalarValues::*;
import RealFunctions::*;
private import ScalarValues::*;
private import RealFunctions::*;

class V6Engine;

Expand Down
2 changes: 1 addition & 1 deletion kerml/src/examples/Packet Example/PacketUsage.kerml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
public import Packets::*;
private import Packets::*;
private import ScalarValues::Real;
package 'Packet Usage' {

Expand Down
Loading

0 comments on commit 852d381

Please sign in to comment.