SYSML2_-416 Updated SysML example models for new cross feature syntax.

seidewitz · seidewitz · commit 18a311771749 · 2024-12-28T00:51:50.000-05:00
diff --git a/sysml/src/examples/Simple Tests/ConstraintTest.sysml b/sysml/src/examples/Simple Tests/ConstraintTest.sysml
@@ -27,9 +27,9 @@ package ConstraintTest {
 		}
 		
 		bind massAnalysis.totalMass = mass;
-		bind massAnalysis.componentMasses[1] = engine.mass;
-		bind massAnalysis.componentMasses[1] = frontAxleAssembly.mass;
-		bind massAnalysis.componentMasses[1] = rearAxleAssembly.mass;
+		bind massAnalysis.componentMasses = engine.mass;
+		bind massAnalysis.componentMasses = frontAxleAssembly.mass;
+		bind massAnalysis.componentMasses = rearAxleAssembly.mass;
 	}
 	
 	part vehicle1b :> vehicle {		
@@ -50,9 +50,9 @@ package ConstraintTest {
 		assert constraint massConstraint : MassAnalysis2;
 		
 		bind massConstraint.totalMass = mass;
-		bind massConstraint.componentMasses[1] = engine.mass;
-		bind massConstraint.componentMasses[1] = frontAxleAssembly.mass;
-		bind massConstraint.componentMasses[1] = rearAxleAssembly.mass;
+		bind massConstraint.componentMasses = engine.mass;
+		bind massConstraint.componentMasses = frontAxleAssembly.mass;
+		bind massConstraint.componentMasses = rearAxleAssembly.mass;
 	}
 		
 	part vehicle2b :> vehicle {
diff --git a/sysml/src/examples/Vehicle Example/SysML v2 Spec Annex A SimpleVehicleModel.sysml b/sysml/src/examples/Vehicle Example/SysML v2 Spec Annex A SimpleVehicleModel.sysml
@@ -637,9 +637,9 @@ package SimpleVehicleModel{
                         connect differential.rightDiffPort to rearAxle.rightHalfAxle.rightAxleToDiffPort;
                         
                         interface wheelToleftHalAxleInterface:WheelHubInterface 
-                            connect rearWheel1.lugNutCompositePort [1] to rearAxle.leftHalfAxle.shankCompositePort [1];
+                            connect [1] rearWheel1.lugNutCompositePort to [1] rearAxle.leftHalfAxle.shankCompositePort;
                         interface wheelTorightHalAxleInterface:WheelHubInterface
-                            connect rearWheel2.lugNutCompositePort [1] to rearAxle.rightHalfAxle.shankCompositePort [1];
+                            connect [1] rearWheel2.lugNutCompositePort to [1] rearAxle.rightHalfAxle.shankCompositePort;
                         
                     }
                     part starterMotor:StarterMotor;
@@ -950,7 +950,7 @@ package SimpleVehicleModel{
                     }
                 }
                 interface wheelHubInterface:WheelHubInterface
-                    connect wheel1.lugNutCompositePort [1] to hub1.shankCompositePort [1];
+                    connect [1] wheel1.lugNutCompositePort to [1] hub1.shankCompositePort;
             }
             // alternative 2 - w multiple nesxted interfaces
             part wheelHubAssy2{
@@ -965,9 +965,9 @@ package SimpleVehicleModel{
                     }
                 }
                 interface wheelHubInterface:WheelHubInterface
-                    connect lugNutCompositePort ::> wheel1.lugNutCompositePort [1] to shankCompositePort ::> hub1.shankCompositePort [1] {
+                    connect [1] lugNutCompositePort ::> wheel1.lugNutCompositePort to [1] shankCompositePort ::> hub1.shankCompositePort {
                         interface wheelFastenerInterface1 :> wheelFastenerInterface
-                            connect lugNutPort ::> lugNutCompositePort.lugNutPort [5] to shankPort ::> shankCompositePort.shankPort [5];
+                            connect [5] lugNutPort ::> lugNutCompositePort.lugNutPort to [5] shankPort ::> shankCompositePort.shankPort;
                         }
             }
             // alternative 3 - w explicit nesxted interfaces
@@ -996,7 +996,7 @@ package SimpleVehicleModel{
                     }
 }
                 interface wheelHubInterface:WheelHubInterface
-                    connect lugNutCompositePort ::> wheel1.lugNutCompositePort [1] to shankCompositePort ::> hub1.shankCompositePort [1] {
+                    connect [1] lugNutCompositePort ::> wheel1.lugNutCompositePort to [1] shankCompositePort ::> hub1.shankCompositePort {
                         interface wheelFastenerInterface1 :> wheelFastenerInterface
                             connect lugNutPort ::> lugNutCompositePort.lugNutPort1 to shankPort ::> shankCompositePort.shankPort1 {
                                 attribute :>> maxTorque = 90 * 1.356 [N*m];
diff --git a/sysml/src/training/09. Connections/Connections Example.sysml b/sysml/src/training/09. Connections/Connections Example.sysml
@@ -35,8 +35,8 @@ package 'Connections Example' {
 		part hub : Hub[1] {
 			part h : LugBoltThreadableHole[5];
 		}
-		connect lugBoltJoints[0..1] to wheel.w.mountingHoles[1];
-		connect lugBoltJoints[0..1] to hub.h[1];
+		connect [0..1] lugBoltJoints to [1] wheel.w.mountingHoles;
+		connect [0..1] lugBoltJoints to [1] hub.h;
 	}
 	
 }
diff --git a/sysml/src/training/11. Interfaces/Interface Decomposition Example.sysml b/sysml/src/training/11. Interfaces/Interface Decomposition Example.sysml
@@ -7,11 +7,11 @@ package 'Interface Decomposition Example' {
 	port def FaucetInlet;
 	
 	interface def WaterDelivery {
-		end suppliedBy : SpigotBank[1] {
+		end [1] port suppliedBy : SpigotBank {
 			port hot : Spigot;
 			port cold : Spigot;
 		}
-		end deliveredTo : Faucet[1..*] {
+		end [1..*] port deliveredTo : Faucet {
 			port hot : FaucetInlet;
 			port cold : FaucetInlet;
 		}
diff --git a/sysml/src/training/40. Language Extension/Model Library Example.sysml b/sysml/src/training/40. Language Extension/Model Library Example.sysml
@@ -19,8 +19,8 @@ library package 'Model Library Example' {
 	abstract occurrence failures : Failure[*] nonunique :> situations;
 	
 	abstract connection def Causation :> Occurrences::HappensBefore {
-		end cause : Situation[*];
-		end effect : Situation[*];
+		end [*] ref cause : Situation;
+		end [*] ref effect : Situation;
 	}
 	
 	abstract connection causations : Causation[*] nonunique;
diff --git a/sysml/src/validation/07-Variant Configuration/7a1-Variant Configuration - General Concept-a.sysml b/sysml/src/validation/07-Variant Configuration/7a1-Variant Configuration - General Concept-a.sysml
@@ -50,7 +50,7 @@ package '7a1-Variant Configuration - General Concept-a' {
 			}
 		}
 		
-		connect subsystemA.part3.p1[0..1] to subsystemB.part5.p2[1];
+		connect [0..1] subsystemA.part3.p1 to [1] subsystemB.part5.p2;
 		
 		assert constraint {
 			subsystemA != subsystemA.subsystem2 | 
diff --git a/sysml/src/validation/14-Language Extensions/14c-Language Extensions.sysml b/sysml/src/validation/14-Language Extensions/14c-Language Extensions.sysml
@@ -36,8 +36,8 @@ package '14c-Language-Extensions' {
 		abstract item fmeaItems : FMEAItem[*] nonunique;
 				
 		connection def Causation :> Occurrences::HappensBefore {
-			end cause[*]: Situation;
-			end effect[*]: Situation;
+			end [*] ref cause: Situation;
+			end [*] ref effect: Situation;
 		}
 		
 		abstract connection causations : Causation[*] nonunique;
@@ -53,15 +53,15 @@ package '14c-Language-Extensions' {
 		enum def SIL { A; B; C; }
 		
 		connection def Violation {
-			end sit[*]: Situation;
-			end req[*]: FMEARequirement;
+			end [*] ref sit: Situation;
+			end [*] ref req: FMEARequirement;
 		}
 		
 		abstract connection violations : Violation[*] nonunique;
 		
 		abstract connection def ControllingMeasure {
-			end sit[*]: Situation;
-			end req[*]: FMEARequirement;
+			end [*] ref sit: Situation;
+			end [*] ref req: FMEARequirement;
 		}
 		
 		connection def Prevention :> ControllingMeasure;

Original file line number	Diff line number	Diff line change
`@@ -637,9 +637,9 @@ package SimpleVehicleModel{`
`637`	`637`	`connect differential.rightDiffPort to rearAxle.rightHalfAxle.rightAxleToDiffPort;`
`638`	`638`
`639`	`639`	`interface wheelToleftHalAxleInterface:WheelHubInterface`
`640`		`- connect rearWheel1.lugNutCompositePort [1] to rearAxle.leftHalfAxle.shankCompositePort [1];`
	`640`	`+ connect [1] rearWheel1.lugNutCompositePort to [1] rearAxle.leftHalfAxle.shankCompositePort;`
`641`	`641`	`interface wheelTorightHalAxleInterface:WheelHubInterface`
`642`		`- connect rearWheel2.lugNutCompositePort [1] to rearAxle.rightHalfAxle.shankCompositePort [1];`
	`642`	`+ connect [1] rearWheel2.lugNutCompositePort to [1] rearAxle.rightHalfAxle.shankCompositePort;`
`643`	`643`
`644`	`644`	`}`
`645`	`645`	`part starterMotor:StarterMotor;`
`@@ -950,7 +950,7 @@ package SimpleVehicleModel{`
`950`	`950`	`}`
`951`	`951`	`}`
`952`	`952`	`interface wheelHubInterface:WheelHubInterface`
`953`		`- connect wheel1.lugNutCompositePort [1] to hub1.shankCompositePort [1];`
	`953`	`+ connect [1] wheel1.lugNutCompositePort to [1] hub1.shankCompositePort;`
`954`	`954`	`}`
`955`	`955`	`// alternative 2 - w multiple nesxted interfaces`
`956`	`956`	`part wheelHubAssy2{`
`@@ -965,9 +965,9 @@ package SimpleVehicleModel{`
`965`	`965`	`}`
`966`	`966`	`}`
`967`	`967`	`interface wheelHubInterface:WheelHubInterface`
`968`		`- connect lugNutCompositePort ::> wheel1.lugNutCompositePort [1] to shankCompositePort ::> hub1.shankCompositePort [1] {`
	`968`	`+ connect [1] lugNutCompositePort ::> wheel1.lugNutCompositePort to [1] shankCompositePort ::> hub1.shankCompositePort {`
`969`	`969`	`interface wheelFastenerInterface1 :> wheelFastenerInterface`
`970`		`- connect lugNutPort ::> lugNutCompositePort.lugNutPort [5] to shankPort ::> shankCompositePort.shankPort [5];`
	`970`	`+ connect [5] lugNutPort ::> lugNutCompositePort.lugNutPort to [5] shankPort ::> shankCompositePort.shankPort;`
`971`	`971`	`}`
`972`	`972`	`}`
`973`	`973`	`// alternative 3 - w explicit nesxted interfaces`
`@@ -996,7 +996,7 @@ package SimpleVehicleModel{`
`996`	`996`	`}`
`997`	`997`	`}`
`998`	`998`	`interface wheelHubInterface:WheelHubInterface`
`999`		`- connect lugNutCompositePort ::> wheel1.lugNutCompositePort [1] to shankCompositePort ::> hub1.shankCompositePort [1] {`
	`999`	`+ connect [1] lugNutCompositePort ::> wheel1.lugNutCompositePort to [1] shankCompositePort ::> hub1.shankCompositePort {`
`1000`	`1000`	`interface wheelFastenerInterface1 :> wheelFastenerInterface`
`1001`	`1001`	`connect lugNutPort ::> lugNutCompositePort.lugNutPort1 to shankPort ::> shankCompositePort.shankPort1 {`
`1002`	`1002`	`attribute :>> maxTorque = 90 * 1.356 [N*m];`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ package 'Connections Example' {`
`35`	`35`	`part hub : Hub[1] {`
`36`	`36`	`part h : LugBoltThreadableHole[5];`
`37`	`37`	`}`
`38`		`- connect lugBoltJoints[0..1] to wheel.w.mountingHoles[1];`
`39`		`- connect lugBoltJoints[0..1] to hub.h[1];`
	`38`	`+ connect [0..1] lugBoltJoints to [1] wheel.w.mountingHoles;`
	`39`	`+ connect [0..1] lugBoltJoints to [1] hub.h;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ package 'Interface Decomposition Example' {`
`7`	`7`	`port def FaucetInlet;`
`8`	`8`
`9`	`9`	`interface def WaterDelivery {`
`10`		`- end suppliedBy : SpigotBank[1] {`
	`10`	`+ end [1] port suppliedBy : SpigotBank {`
`11`	`11`	`port hot : Spigot;`
`12`	`12`	`port cold : Spigot;`
`13`	`13`	`}`
`14`		`- end deliveredTo : Faucet[1..*] {`
	`14`	`+ end [1..*] port deliveredTo : Faucet {`
`15`	`15`	`port hot : FaucetInlet;`
`16`	`16`	`port cold : FaucetInlet;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ library package 'Model Library Example' {`
`19`	`19`	`abstract occurrence failures : Failure[*] nonunique :> situations;`
`20`	`20`
`21`	`21`	`abstract connection def Causation :> Occurrences::HappensBefore {`
`22`		`- end cause : Situation[*];`
`23`		`- end effect : Situation[*];`
	`22`	`+ end [*] ref cause : Situation;`
	`23`	`+ end [*] ref effect : Situation;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`abstract connection causations : Causation[*] nonunique;`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ package '7a1-Variant Configuration - General Concept-a' {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- connect subsystemA.part3.p1[0..1] to subsystemB.part5.p2[1];`
	`53`	`+ connect [0..1] subsystemA.part3.p1 to [1] subsystemB.part5.p2;`
`54`	`54`
`55`	`55`	`assert constraint {`
`56`	`56`	`subsystemA != subsystemA.subsystem2 \|`