@memoarchitect/ontology 0.7.0 → 0.8.24

package/examples/surgical-closure-workflow/model/catalog/surgical_closure_workflow.sysml

@@ -3,6 +3,7 @@
 // as context → use case → workflow → scenarios → scenario-owned activities.
 package memo_examples_surgical_closure_workflow {
     private import ScalarValues::*;
+    private import ModelingMetadata::*;
 
     private import memo_core_enumerations::*;
     private import memo_core_relationships::*;
@@ -39,7 +40,7 @@ package memo_examples_surgical_closure_workflow {
     }
     requirement needControlledGastricResection : Need {
         attribute :>> needKind = NeedKind::clinicalUser;
-        attribute :>> needId = "LSG-N-001";
+        attribute :>> id = "LSG-N-001";
         attribute :>> statement = "The surgical team needs to perform gastric resection with controlled anatomy, haemostasis, and a checked staple line.";
     }
     use case ucPerformSleeveGastrectomy : UseCase {
@@ -53,39 +54,38 @@ package memo_examples_surgical_closure_workflow {
         ref :>> primaryUser = bariatricSurgeon;
         ref :>> supportingActors = (scrubNurse, anesthetist);
         ref :>> useContext = bariatricOr;
+        subject supportingSystem;
+        actor bariatricSurgeonInitiator = bariatricSurgeon;
     }
     connection : Motivates connect motivatingNeed ::> needControlledGastricResection to motivatedUseCase ::> ucPerformSleeveGastrectomy;
-    connection : Initiates connect initiatingUser ::> bariatricSurgeon to initiatedUseCase ::> ucPerformSleeveGastrectomy;
 
     // ── Procedure workflow ──────────────────────────────────────
-    action actTimeOutAndPosition : OperationalActivity { attribute :>> id = "LSG-ACT-001"; attribute :>> name = "ConfirmTimeOutAndPosition"; }
-    action actEstablishAccess : OperationalActivity { attribute :>> id = "LSG-ACT-002"; attribute :>> name = "EstablishLaparoscopicAccess"; }
-    action actMobilizeStomach : OperationalActivity { attribute :>> id = "LSG-ACT-003"; attribute :>> name = "MobilizeStomach"; }
-    action actSizeAndCreateSleeve : OperationalActivity { attribute :>> id = "LSG-ACT-004"; attribute :>> name = "SizeAndCreateSleeve"; attribute :>> criticality = CriticalityKind::high; }
-    action actAssessStapleLine : OperationalActivity { attribute :>> id = "LSG-ACT-005"; attribute :>> name = "AssessStapleLine"; attribute :>> criticality = CriticalityKind::high; }
-    action actExtractSpecimenAndClose : OperationalActivity { attribute :>> id = "LSG-ACT-006"; attribute :>> name = "ExtractSpecimenAndClosePorts"; }
-    action actHandover : OperationalActivity { attribute :>> id = "LSG-ACT-007"; attribute :>> name = "CompletePostoperativeHandover"; }
+    action actTimeOutAndPosition : OperativeAction { attribute :>> id = "LSG-ACT-001"; attribute :>> name = "ConfirmTimeOutAndPosition"; }
+    action actEstablishAccess : OperativeAction { attribute :>> id = "LSG-ACT-002"; attribute :>> name = "EstablishLaparoscopicAccess"; }
+    action actMobilizeStomach : OperativeAction { attribute :>> id = "LSG-ACT-003"; attribute :>> name = "MobilizeStomach"; }
+    action actSizeAndCreateSleeve : OperativeAction {
+        attribute :>> id = "LSG-ACT-004"; attribute :>> name = "SizeAndCreateSleeve"; attribute :>> criticality = CriticalityKind::high;
 
-    action taskCreateStapleLine : UserTask {
-        attribute :>> criticality = CriticalityKind::high;
-        attribute :>> id = "LSG-TASK-001";
-        attribute :>> name = "CreateAndInspectStapleLine";
-        attribute :>> taskGoal = "create the planned sleeve and identify bleeding or integrity concerns before completion";
-        attribute :>> potentialHarm = "bleeding or staple-line complication not recognized before handover";
-        attribute :>> severityIfFailed = SeverityKind::serious;
+        action taskCreateStapleLine : OperativeAction {
+            attribute :>> criticality = CriticalityKind::high;
+            attribute :>> id = "LSG-TASK-001";
+            attribute :>> name = "CreateAndInspectStapleLine";
+            attribute :>> taskGoal = "create the planned sleeve and identify bleeding or integrity concerns before completion";
+            attribute :>> potentialHarm = "bleeding or staple-line complication not recognized before handover";
+            attribute :>> severityIfFailed = SeverityKind::serious;
+
+            action stConfirmAnatomy : OperativeAction { attribute :>> id = "LSG-ST-001"; attribute :>> name = "ConfirmAnatomy"; }
+            action stCreateStapleLine : OperativeAction { attribute :>> id = "LSG-ST-002"; attribute :>> name = "CreateStapleLine"; }
+            action stInspectBleeding : OperativeAction { attribute :>> id = "LSG-ST-003"; attribute :>> name = "InspectForBleeding"; }
+            action stAssessIntegrity : OperativeAction { attribute :>> id = "LSG-ST-004"; attribute :>> name = "AssessStapleLineIntegrity"; }
+            first stConfirmAnatomy then stCreateStapleLine;
+            first stCreateStapleLine then stInspectBleeding;
+            first stInspectBleeding then stAssessIntegrity;
+        }
     }
-    action stConfirmAnatomy : TaskStep { attribute :>> id = "LSG-ST-001"; attribute :>> name = "ConfirmAnatomy"; }
-    action stCreateStapleLine : TaskStep { attribute :>> id = "LSG-ST-002"; attribute :>> name = "CreateStapleLine"; }
-    action stInspectBleeding : TaskStep { attribute :>> id = "LSG-ST-003"; attribute :>> name = "InspectForBleeding"; }
-    action stAssessIntegrity : TaskStep { attribute :>> id = "LSG-ST-004"; attribute :>> name = "AssessStapleLineIntegrity"; }
-    first stConfirmAnatomy then stCreateStapleLine;
-    first stCreateStapleLine then stInspectBleeding;
-    first stInspectBleeding then stAssessIntegrity;
-    connection : Composes connect parent ::> actSizeAndCreateSleeve to child ::> taskCreateStapleLine;
-    connection : Composes connect parent ::> taskCreateStapleLine to child ::> stConfirmAnatomy;
-    connection : Composes connect parent ::> taskCreateStapleLine to child ::> stCreateStapleLine;
-    connection : Composes connect parent ::> taskCreateStapleLine to child ::> stInspectBleeding;
-    connection : Composes connect parent ::> taskCreateStapleLine to child ::> stAssessIntegrity;
+    action actAssessStapleLine : OperativeAction { attribute :>> id = "LSG-ACT-005"; attribute :>> name = "AssessStapleLine"; attribute :>> criticality = CriticalityKind::high; }
+    action actExtractSpecimenAndClose : OperativeAction { attribute :>> id = "LSG-ACT-006"; attribute :>> name = "ExtractSpecimenAndClosePorts"; }
+    action actHandover : OperativeAction { attribute :>> id = "LSG-ACT-007"; attribute :>> name = "CompletePostoperativeHandover"; }
 
     action wfSleeveGastrectomy : ClinicalProcedureWorkflow {
         attribute :>> id = "LSG-WF-001";
@@ -95,61 +95,44 @@ package memo_examples_surgical_closure_workflow {
         attribute :>> completionCondition = "staple line assessed; postoperative handover complete";
         attribute :>> clinicalObjective = "create a gastric sleeve after controlled mobilisation and staple-line assessment";
     }
-    action wsTimeOut : WorkflowStep { ref :>> performedActivity = actTimeOutAndPosition; }
-    action wsAccess : WorkflowStep { ref :>> performedActivity = actEstablishAccess; }
-    action wsMobilize : WorkflowStep { ref :>> performedActivity = actMobilizeStomach; }
-    action wsSleeve : WorkflowStep { ref :>> performedActivity = actSizeAndCreateSleeve; }
-    action wsAssess : WorkflowStep { ref :>> performedActivity = actAssessStapleLine; }
-    action wsClose : WorkflowStep { ref :>> performedActivity = actExtractSpecimenAndClose; }
-    action wsHandover : WorkflowStep { ref :>> performedActivity = actHandover; }
-    connection : Composes connect parent ::> wfSleeveGastrectomy to child ::> wsTimeOut;
-    connection : Composes connect parent ::> wfSleeveGastrectomy to child ::> wsAccess;
-    connection : Composes connect parent ::> wfSleeveGastrectomy to child ::> wsMobilize;
-    connection : Composes connect parent ::> wfSleeveGastrectomy to child ::> wsSleeve;
-    connection : Composes connect parent ::> wfSleeveGastrectomy to child ::> wsAssess;
-    connection : Composes connect parent ::> wfSleeveGastrectomy to child ::> wsClose;
-    connection : Composes connect parent ::> wfSleeveGastrectomy to child ::> wsHandover;
-    first wsTimeOut then wsAccess;
-    first wsAccess then wsMobilize;
-    first wsMobilize then wsSleeve;
-    first wsSleeve then wsAssess;
-    first wsAssess then wsClose;
-    first wsClose then wsHandover;
-    connection : Supports { attribute :>> supportKind = SupportKind::useCase; connect supporter ::> wfSleeveGastrectomy to supported ::> ucPerformSleeveGastrectomy; }
 
     // ── Scenario paths, each with its own activity/action flow ──
-    action oaCompleteSleeveProcedure : OperationalActivity {
-        attribute :>> name = "CompleteNominalSleeveProcedure";
-        action prepare; action createSleeve; action assess; action handover;
-        first start then prepare; first prepare then createSleeve; first createSleeve then assess; first assess then handover; first handover then done;
-    }
-    action oaControlStapleLineBleeding : OperationalActivity {
-        attribute :>> name = "ControlStapleLineBleeding";
-        action recognizeBleeding; action controlBleeding; action reassessStapleLine; action escalateIfNeeded;
-        first start then recognizeBleeding; first recognizeBleeding then controlBleeding; first controlBleeding then reassessStapleLine; first reassessStapleLine then escalateIfNeeded; first escalateIfNeeded then done;
-    }
     action scNominalSleeveProcedure : OperativeScenario {
         attribute :>> id = "LSG-SC-001"; attribute :>> name = "NominalSleeveGastrectomy";
-        attribute :>> variantKind = ScenarioVariantKind::nominal;
-        attribute :>> operationalCondition = OperationalConditionKind::normal;
         attribute :>> pathSummary = "Time-out, access, mobilisation, sleeve creation, staple-line assessment, closure, and handover complete without rework.";
-        ref :>> parentWorkflow = wfSleeveGastrectomy;
-        ref :>> parentUseCase = ucPerformSleeveGastrectomy;
-        ref :>> activities = oaCompleteSleeveProcedure;
+
+        perform actTimeOutAndPosition;
+        perform actEstablishAccess;
+        perform actMobilizeStomach;
+        perform actSizeAndCreateSleeve;
+        perform actAssessStapleLine;
+        perform actExtractSpecimenAndClose;
+        perform actHandover;
+        first actTimeOutAndPosition then actEstablishAccess;
+        first actEstablishAccess then actMobilizeStomach;
+        first actMobilizeStomach then actSizeAndCreateSleeve;
+        first actSizeAndCreateSleeve then actAssessStapleLine;
+        first actAssessStapleLine then actExtractSpecimenAndClose;
+        first actExtractSpecimenAndClose then actHandover;
     }
     action scStapleLineBleeding : OperativeScenario {
+        attribute :>> scenarioKind = ScenarioKind::alternate;
         attribute :>> id = "LSG-SC-002"; attribute :>> name = "StapleLineBleedingRecovery";
-        attribute :>> variantKind = ScenarioVariantKind::recovery;
-        attribute :>> operationalCondition = OperationalConditionKind::degraded;
-        attribute :>> variationPoint = "bleeding observed during staple-line assessment";
         attribute :>> pathSummary = "Recognize bleeding, apply the selected control, reassess the staple line, and escalate if the condition remains unresolved.";
-        ref :>> baseScenario = scNominalSleeveProcedure;
-        ref :>> parentWorkflow = wfSleeveGastrectomy;
-        ref :>> parentUseCase = ucPerformSleeveGastrectomy;
-        ref :>> activities = oaControlStapleLineBleeding;
+
+        action oaControlStapleLineBleeding : OperativeAction {
+            attribute :>> name = "ControlStapleLineBleeding";
+            action recognizeBleeding; action controlBleeding; action reassessStapleLine; action escalateIfNeeded;
+            first start then recognizeBleeding; first recognizeBleeding then controlBleeding; first controlBleeding then reassessStapleLine; first reassessStapleLine then escalateIfNeeded; first escalateIfNeeded then done;
+        }
     }
-    connection : Realizes connect realizing ::> scNominalSleeveProcedure to realized ::> ucPerformSleeveGastrectomy;
-    connection : Realizes connect realizing ::> scStapleLineBleeding to realized ::> ucPerformSleeveGastrectomy;
-    connection : Composes connect parent ::> scNominalSleeveProcedure to child ::> oaCompleteSleeveProcedure;
-    connection : Composes connect parent ::> scStapleLineBleeding to child ::> oaControlStapleLineBleeding;
+    #refinement dependency scNominalSleeveProcedure to ucPerformSleeveGastrectomy;
+    #refinement dependency scStapleLineBleeding to ucPerformSleeveGastrectomy;
+
+    connection : RealizesUseCase connect realizingWorkflow ::> wfSleeveGastrectomy to realizedUseCase ::> ucPerformSleeveGastrectomy;
+
+
+    connection : HasScenario connect owningWorkflow ::> wfSleeveGastrectomy to pathScenario ::> scNominalSleeveProcedure;
+    connection : HasScenario connect owningWorkflow ::> wfSleeveGastrectomy to pathScenario ::> scStapleLineBleeding;
+
 }

package/examples/surgical-closure-workflow/model/catalog/viewpoints/unassigned/views/surgical_closure_workflow_overview.sysml

@@ -6,7 +6,6 @@ package memo_examples_surgical_closure_workflow_viewpoints_unassigned_views_surg
     view surgicalClosureWorkflowOverview : MemoDiagramView {
         expose memo_examples_surgical_closure_workflow::*;
         attribute depth = 2;
-        attribute :>> title = "Laparoscopic Sleeve Gastrectomy Workflow";
         attribute :>> viewKind = DiagramViewKind::actionflow;
         attribute :>> diagramType = "ofd";
     }

package/examples/surgical-robot/memo.package.yaml

@@ -0,0 +1,3 @@
+name: surgical-robot
+entrypoint: model/catalog/project.sysml
+include: [model]

package/examples/surgical-robot/model/catalog/surgical_robot.sysml

@@ -23,7 +23,7 @@ package memo_examples_surgical_robot {
     connection : IndependentOf connect channel ::> chMotionMonitor to otherChannel ::> chMotionPrimary {
         attribute :>> independenceBasis = "separate sensing, power, and processing; common-cause analysis SR-CCA-01";
     }
-    connection : MonitorsChannel connect monitorChannel ::> chMotionMonitor to monitoredComponent ::> chMotionPrimary;
+    dependency chMotionMonitor to chMotionPrimary;
 
     // Interlock: instrument exchange blocked while arm is in motion.
     part chExchangeInterlock : LogicalComponent {

package/examples/surgical-robot/model/catalog/viewpoints/unassigned/views/surgical_robot_overview.sysml

@@ -6,7 +6,6 @@ package memo_examples_surgical_robot_viewpoints_unassigned_views_surgical_robot_
     view surgicalRobotOverview : MemoDiagramView {
         expose memo_examples_surgical_robot::*;
         attribute depth = 2;
-        attribute :>> title = "Surgical Robot Overview";
         attribute :>> viewKind = DiagramViewKind::interconnection;
         attribute :>> diagramType = "ibd";
     }

package/examples/sysml-diagram-samples/memo.package.yaml

@@ -7,5 +7,7 @@
 # (`type`, `extends`, `usage`, `ontologies`, `methodology`, `modules`) were
 # removed at the native semantic flip and are now rejected if present.
 name: sysml-diagram-samples
+entrypoint: model/catalog/project.sysml
+include: [model]
 version: 0.1.0
 description: "MEMO Architect diagram rendering samples \u2014 one openable view per standard SysML v2 diagram type. Open with: memo-architect --example standard-sysml-diagrams"

package/examples/sysml-diagram-samples/model/catalog/viewpoints/unassigned/views/action_flow_view.sysml

@@ -1,6 +1,7 @@
 package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_action_flow_view {
     private import ScalarValues::*;
     private import memo_core_relationships::*;
+    private import ModelingMetadata::*;
 
     private import memo_architecture_logical_structure::*;
     private import memo_architecture_logical_interfaces::*;
@@ -19,15 +20,15 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_action_f
         attribute :>> itemKind = InterfaceItemKind::material;
     }
 
-    action def ReceiveInput specializes SystemAction { out item received : DataPacket; }
-    action def ValidateInput specializes SystemAction { in item received : DataPacket; out item validated : EnergyToken; }
-    action def ProcessInput specializes SystemAction { in item validated : EnergyToken; out item result : MaterialBatch; }
-    action def RecordResult specializes SystemAction { in item result : MaterialBatch; }
+    action def ReceiveInput specializes SystemFunction { out item received : DataPacket; }
+    action def ValidateInput specializes SystemFunction { in item received : DataPacket; out item validated : EnergyToken; }
+    action def ProcessInput specializes SystemFunction { in item validated : EnergyToken; out item result : MaterialBatch; }
+    action def RecordResult specializes SystemFunction { in item result : MaterialBatch; }
 
     part laneA : LogicalComponent { attribute :>> name = "Lane A"; }
     part laneB : LogicalComponent { attribute :>> name = "Lane B"; }
 
-    action sampleActionFlow : SystemAction {
+    action sampleActionFlow : SystemFunction {
         action receive : ReceiveInput;
         action validate : ValidateInput;
         action process : ProcessInput {
@@ -61,7 +62,7 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_action_f
     allocate sampleActionFlow.record to laneB;
 
     // MemoLink sample — the universal relation, exercised where nothing else
-    // reaches. laneB is a `part` (LogicalComponent :> ArchitectureElement) and
+    // reaches. laneB is a `part` (LogicalComponent :> MemoPart) and
     // `sampleActionFlow.process` is an action usage (:> MemoAction). Those
     // foundations share no supertype, so every typed relation in the ontology
     // is unavailable here: legalRelationshipTypes returns MemoLink and nothing
@@ -72,8 +73,10 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_action_f
     // because a value must be a feature and a definition is not.
     connection linkLaneBProcessesInput : MemoLink
         connect linkSource ::> laneB to linkTarget ::> sampleActionFlow.process {
-        attribute :>> linkRationale =
-            "Lane B is the swimlane that carries the ProcessInput behaviour. The association crosses the part/action metaclass boundary, so no typed relation can express it.";
+        @Rationale {
+            :>> text =
+                "Lane B is the swimlane that carries the ProcessInput behaviour. The association crosses the part/action metaclass boundary, so no typed relation can express it.";
+        }
     }
 
     view sampleActionFlowView : MemoDiagramView {
@@ -81,18 +84,9 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_action_f
         expose laneA;
         expose laneB;
         attribute depth = 2;
-        attribute :>> title = "Sample · Action Flow";
         attribute :>> shortDescription = "Dummy actions, typed item flows, successions, and a composite action for renderer development.";
         attribute :>> viewKind = DiagramViewKind::actionflow;
         attribute :>> diagramType = "afd";
-        part :>> viewpointDefinition = functionalViewpoint;
+        ref :>> viewpointDefinition = functionalViewpoint;
     }
-
-    connection : IncludedIn connect sourceElement ::> sampleActionFlow.receive to targetView ::> sampleActionFlowView;
-    connection : IncludedIn connect sourceElement ::> sampleActionFlow.validate to targetView ::> sampleActionFlowView;
-    connection : IncludedIn connect sourceElement ::> sampleActionFlow.process to targetView ::> sampleActionFlowView;
-    connection : IncludedIn connect sourceElement ::> sampleActionFlow.process.processStepA to targetView ::> sampleActionFlowView;
-    connection : IncludedIn connect sourceElement ::> sampleActionFlow.process.processStepB to targetView ::> sampleActionFlowView;
-    connection : IncludedIn connect sourceElement ::> sampleActionFlow.process.processStepC to targetView ::> sampleActionFlowView;
-    connection : IncludedIn connect sourceElement ::> sampleActionFlow.record to targetView ::> sampleActionFlowView;
 }

package/examples/sysml-diagram-samples/model/catalog/viewpoints/unassigned/views/context_view.sysml

@@ -32,26 +32,23 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_context_
     connection : InteractsWith connect contextParticipant ::> clinician to target ::> infusionSystem;
     connection : InteractsWith connect contextParticipant ::> patient to target ::> infusionSystem;
     connection : InteractsWith connect contextParticipant ::> biomedTech to target ::> infusionSystem;
-    connection : ExchangesWith connect source ::> infusionSystem to target ::> pharmacySystem;
+    flow from infusionSystem to pharmacySystem;
     connection : AppliesInContext connect useContext ::> homeContext to subjectElement ::> infusionSystem;
 
     view sampleContextView : MemoDiagramView {
         expose infusionSystem::**;
+        expose clinician;
+        expose patient;
+        expose biomedTech;
+        expose pharmacySystem;
+        expose homeContext;
         attribute depth = 1;
-        attribute :>> title = "Sample · System Context";
         attribute :>> shortDescription = "Operational system context: one black-box system boundary, its external people, peer systems, operating environment, and named boundary-crossing interactions.";
         attribute :>> viewKind = DiagramViewKind::general;
         attribute :>> diagramType = "context";
-        part :>> viewpointDefinition = contextViewpoint;
+        ref :>> viewpointDefinition = contextViewpoint;
         part :>> selectionQuery {
-            attribute :>> includeRelationshipKinds = ("InteractsWith", "ExchangesWith", "AppliesInContext");
+            attribute :>> includeRelationshipKinds = ("InteractsWith", "flow", "AppliesInContext");
         }
     }
-
-    connection : IncludedIn connect sourceElement ::> infusionSystem to targetView ::> sampleContextView;
-    connection : IncludedIn connect sourceElement ::> clinician to targetView ::> sampleContextView;
-    connection : IncludedIn connect sourceElement ::> patient to targetView ::> sampleContextView;
-    connection : IncludedIn connect sourceElement ::> biomedTech to targetView ::> sampleContextView;
-    connection : IncludedIn connect sourceElement ::> pharmacySystem to targetView ::> sampleContextView;
-    connection : IncludedIn connect sourceElement ::> homeContext to targetView ::> sampleContextView;
 }

package/examples/sysml-diagram-samples/model/catalog/viewpoints/unassigned/views/functional_flow_view.sysml

@@ -39,38 +39,37 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_function
     }
 
     // Functions with typed in/out pins
-    action def FxAcquire specializes SystemAction { out item reading : FxSensorReading; }
-    action def FxCompute specializes SystemAction { in item reading : FxSensorReading; out item command : FxRateCommand; }
-    action def FxEnforce specializes SystemAction { in item command : FxRateCommand; out item safeCommand : FxRateCommand; }
-    action def FxDrive specializes SystemAction { in item command : FxRateCommand; out item energy : FxMotorEnergy; }
-    action def FxDeliverMedication specializes SystemAction { in item energy : FxMotorEnergy; out item fluid : FxMedicationFluid; }
-    action def FxMonitor specializes SystemAction { out item signal : FxOcclusionSignal; }
-    action def FxDetect specializes SystemAction { in item signal : FxOcclusionSignal; }
+    action def FxAcquire specializes SystemFunction { out item reading : FxSensorReading; }
+    action def FxCompute specializes SystemFunction { in item reading : FxSensorReading; out item command : FxRateCommand; }
+    action def FxEnforce specializes SystemFunction { in item command : FxRateCommand; out item safeCommand : FxRateCommand; }
+    action def FxDrive specializes SystemFunction { in item command : FxRateCommand; out item energy : FxMotorEnergy; }
+    action def FxDeliverMedication specializes SystemFunction { in item energy : FxMotorEnergy; out item fluid : FxMedicationFluid; }
+    action def FxMonitor specializes SystemFunction { out item signal : FxOcclusionSignal; }
+    action def FxDetect specializes SystemFunction { in item signal : FxOcclusionSignal; }
 
     // Component hierarchy used by the Level control:
     // L1 system → L2 subsystems → L3 allocated components.
-    part fxPumpSystem : LogicalComponent { attribute :>> name = "Infusion Pump System"; }
-    part fxSensingSubsystem : LogicalComponent { attribute :>> name = "Sensing Subsystem"; }
-    part fxControlSubsystem : LogicalComponent { attribute :>> name = "Control Subsystem"; }
-    part fxDeliverySubsystem : LogicalComponent { attribute :>> name = "Delivery Subsystem"; }
-    part fxSafetySubsystem : LogicalComponent { attribute :>> name = "Safety Subsystem"; }
-
-    // L3 components — one natural-level swimlane each
-    part fxSensor : LogicalComponent { attribute :>> name = "Sensor Subsystem"; }
-    part fxController : LogicalComponent { attribute :>> name = "Infusion Controller"; }
-    part fxActuator : LogicalComponent { attribute :>> name = "Pump Actuator"; }
-    part fxSafety : LogicalComponent { attribute :>> name = "Safety Monitor"; }
-
-    connection : Composes connect parent ::> fxPumpSystem to child ::> fxSensingSubsystem;
-    connection : Composes connect parent ::> fxPumpSystem to child ::> fxControlSubsystem;
-    connection : Composes connect parent ::> fxPumpSystem to child ::> fxDeliverySubsystem;
-    connection : Composes connect parent ::> fxPumpSystem to child ::> fxSafetySubsystem;
-    connection : Composes connect parent ::> fxSensingSubsystem to child ::> fxSensor;
-    connection : Composes connect parent ::> fxControlSubsystem to child ::> fxController;
-    connection : Composes connect parent ::> fxDeliverySubsystem to child ::> fxActuator;
-    connection : Composes connect parent ::> fxSafetySubsystem to child ::> fxSafety;
+    part fxPumpSystem : LogicalComponent {
+        attribute :>> name = "Infusion Pump System";
+        part fxSensingSubsystem : LogicalComponent {
+            attribute :>> name = "Sensing Subsystem";
+            part fxSensor : LogicalComponent { attribute :>> name = "Sensor Subsystem"; }
+        }
+        part fxControlSubsystem : LogicalComponent {
+            attribute :>> name = "Control Subsystem";
+            part fxController : LogicalComponent { attribute :>> name = "Infusion Controller"; }
+        }
+        part fxDeliverySubsystem : LogicalComponent {
+            attribute :>> name = "Delivery Subsystem";
+            part fxActuator : LogicalComponent { attribute :>> name = "Pump Actuator"; }
+        }
+        part fxSafetySubsystem : LogicalComponent {
+            attribute :>> name = "Safety Subsystem";
+            part fxSafety : LogicalComponent { attribute :>> name = "Safety Monitor"; }
+        }
+    }
 
-    action fxDeliveryFlow : SystemAction {
+    action fxDeliveryFlow : SystemFunction {
         action fxAcquire : FxAcquire { attribute :>> name = "Acquire Sensor Data"; }
         action fxCompute : FxCompute { attribute :>> name = "Compute Infusion Rate"; }
 
@@ -85,9 +84,9 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_function
         // Composite function — valve sub-flow (drill-in)
         action fxDeliver : FxDeliverMedication {
             attribute :>> name = "Deliver Medication";
-            action fxOpenValve : SystemAction { attribute :>> name = "Open Valve"; }
-            action fxHoldDose : SystemAction { attribute :>> name = "Hold Metered Dose"; }
-            action fxCloseValve : SystemAction { attribute :>> name = "Close Valve"; }
+            action fxOpenValve : SystemFunction { attribute :>> name = "Open Valve"; }
+            action fxHoldDose : SystemFunction { attribute :>> name = "Hold Metered Dose"; }
+            action fxCloseValve : SystemFunction { attribute :>> name = "Close Valve"; }
 
             flow of FxMedicationFluid from fxDeliveryFlow.fxDeliver.fxHoldDose to fxCloseValve;
 
@@ -97,7 +96,7 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_function
             first fxCloseValve then done;
         }
 
-        action fxLog : SystemAction { attribute :>> name = "Log Delivery"; }
+        action fxLog : SystemFunction { attribute :>> name = "Log Delivery"; }
 
         flow of FxSensorReading from fxAcquire.reading to fxCompute.reading;
         flow of FxRateCommand from fxEnforce.safeCommand to fxDrive.command;
@@ -119,49 +118,25 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_function
     }
 
     // Swimlane allocation — which component realises each function
-    allocate fxDeliveryFlow.fxAcquire to fxSensor;
-    allocate fxDeliveryFlow.fxCompute to fxController;
-    allocate fxDeliveryFlow.fxEnforce to fxSafety;
-    allocate fxDeliveryFlow.fxDrive to fxActuator;
-    allocate fxDeliveryFlow.fxDeliver to fxActuator;
-    allocate fxDeliveryFlow.fxMonitor to fxSafety;
-    allocate fxDeliveryFlow.fxDetect to fxSafety;
-    allocate fxDeliveryFlow.fxLog to fxController;
-    allocate fxDeliveryFlow.fxDeliver.fxOpenValve to fxActuator;
-    allocate fxDeliveryFlow.fxDeliver.fxHoldDose to fxActuator;
-    allocate fxDeliveryFlow.fxDeliver.fxCloseValve to fxActuator;
+    allocate fxDeliveryFlow.fxAcquire to fxPumpSystem.fxSensingSubsystem.fxSensor;
+    allocate fxDeliveryFlow.fxCompute to fxPumpSystem.fxControlSubsystem.fxController;
+    allocate fxDeliveryFlow.fxEnforce to fxPumpSystem.fxSafetySubsystem.fxSafety;
+    allocate fxDeliveryFlow.fxDrive to fxPumpSystem.fxDeliverySubsystem.fxActuator;
+    allocate fxDeliveryFlow.fxDeliver to fxPumpSystem.fxDeliverySubsystem.fxActuator;
+    allocate fxDeliveryFlow.fxMonitor to fxPumpSystem.fxSafetySubsystem.fxSafety;
+    allocate fxDeliveryFlow.fxDetect to fxPumpSystem.fxSafetySubsystem.fxSafety;
+    allocate fxDeliveryFlow.fxLog to fxPumpSystem.fxControlSubsystem.fxController;
+    allocate fxDeliveryFlow.fxDeliver.fxOpenValve to fxPumpSystem.fxDeliverySubsystem.fxActuator;
+    allocate fxDeliveryFlow.fxDeliver.fxHoldDose to fxPumpSystem.fxDeliverySubsystem.fxActuator;
+    allocate fxDeliveryFlow.fxDeliver.fxCloseValve to fxPumpSystem.fxDeliverySubsystem.fxActuator;
 
     view fxDeliveryView : MemoDiagramView {
         expose fxDeliveryFlow::**;
         expose fxPumpSystem::**;
         attribute depth = 2;
-        attribute :>> title = "Sample · Dose Delivery (Functional Flow)";
         attribute :>> shortDescription = "Component behaviour: functions in swimlanes per realising component, typed data/energy/material flows, a fork/join for concurrent occlusion monitoring, and a composite 'Deliver Medication' valve sub-flow (double-click to drill in).";
         attribute :>> viewKind = DiagramViewKind::actionflow;
         attribute :>> diagramType = "ffd";
-        part :>> viewpointDefinition = functionalViewpoint;
+        ref :>> viewpointDefinition = functionalViewpoint;
     }
-
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxAcquire to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxCompute to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxForkDeliver to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxEnforce to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxDrive to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxDeliver to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxMonitor to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxDetect to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxJoinDeliver to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxLog to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxDeliver.fxOpenValve to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxDeliver.fxHoldDose to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliveryFlow.fxDeliver.fxCloseValve to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxPumpSystem to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxSensingSubsystem to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxControlSubsystem to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxDeliverySubsystem to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxSafetySubsystem to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxSensor to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxController to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxActuator to targetView ::> fxDeliveryView;
-    connection : IncludedIn connect sourceElement ::> fxSafety to targetView ::> fxDeliveryView;
 }