Align the teaching source and language contract with compact defaults
This commit is contained in:
@@ -1,43 +1,34 @@
|
||||
oa_activity oa_restore_work "Restore safe pressure" id "1b91f8a7-0bdb-514e-b1cd-955658e09927" {
|
||||
description "";
|
||||
parent none;
|
||||
}
|
||||
|
||||
oa_activity oa_assess "Assess pressure alarm" id "61f7bbfb-74a4-5540-9182-2583dfb27a49" {
|
||||
description "";
|
||||
parent @oa_restore_work;
|
||||
}
|
||||
|
||||
oa_activity oa_confirm "Confirm safe pressure" id "727c0b5c-8db6-5eb7-83d6-735519c5949f" {
|
||||
description "";
|
||||
parent @oa_restore_work;
|
||||
}
|
||||
|
||||
oa_activity oa_repair "Repair valve in the field" id "a21465af-05f3-5fb5-8983-de26932422fb" {
|
||||
description "";
|
||||
parent @oa_restore_work;
|
||||
}
|
||||
|
||||
oa_activity oa_reset "Reset valve remotely" id "d0c8be87-d238-503a-a549-7558a210507f" {
|
||||
description "";
|
||||
parent @oa_restore_work;
|
||||
}
|
||||
|
||||
capability_involvement oa_assessment_support "Capability involvement: Assess an alarm" id "ffdbfcd0-d423-5707-a880-0dfbe1400f72" {
|
||||
description "";
|
||||
source @oa_assess;
|
||||
target @oa_triage;
|
||||
}
|
||||
|
||||
interaction oa_repair_request "Request field repair" id "cf423ea2-8b2e-5a27-93d4-5e8542d9db8d" {
|
||||
description "";
|
||||
items [@oa_repair_operation];
|
||||
source @oa_assess;
|
||||
target @oa_repair;
|
||||
}
|
||||
|
||||
interaction oa_repair_report "Report repair result" id "b436d0b3-c824-5a96-af6b-2c269816d1cc" {
|
||||
description "";
|
||||
items [@oa_repair_operation];
|
||||
source @oa_repair;
|
||||
target @oa_confirm;
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
oa_process oa_assessment_procedure "Assess an alarm procedure" id "022d3cfa-bbaf-5e13-924a-8e55099b8745" {
|
||||
description "";
|
||||
parent none;
|
||||
steps [@oa_assessment_action];
|
||||
}
|
||||
|
||||
@@ -8,17 +6,12 @@ oa_occurrence oa_assessment_action "Assess pressure alarm" id "942975b8-0bef-5ae
|
||||
body {
|
||||
Action {
|
||||
action @oa_assess;
|
||||
lifeline none;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_assessment_procedure;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
chain_involvement oa_assessment_delivery "Chain involvement: Assess an alarm" id "628cb4fc-fe63-5f6b-b364-6268f26b5740" {
|
||||
description "";
|
||||
source @oa_assessment_procedure;
|
||||
target @oa_triage;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
oa_process oa_field_procedure "Field repair procedure" id "5d3af417-244c-54bb-9588-16daedda4e1f" {
|
||||
description "";
|
||||
parent none;
|
||||
steps [@oa_request_step, @oa_repair_step, @oa_report_step];
|
||||
}
|
||||
|
||||
@@ -8,59 +6,35 @@ oa_occurrence oa_repair_step "Repair the valve" id "c59432fe-6092-5ee0-908d-9dbf
|
||||
body {
|
||||
Action {
|
||||
action @oa_repair;
|
||||
lifeline none;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_field_procedure;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
oa_occurrence oa_report_step "Report the measured result" id "df2fd3f8-6bc2-5380-a13f-36643ed35ac7" {
|
||||
body {
|
||||
Exchange {
|
||||
exchange @oa_repair_report;
|
||||
message_kind Asynchronous;
|
||||
receiver none;
|
||||
reply_to none;
|
||||
sender none;
|
||||
values [];
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_field_procedure;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
oa_occurrence oa_request_step "Request the field repair" id "5ba8079c-2dbe-5e98-ae82-2b60c6020a02" {
|
||||
body {
|
||||
Exchange {
|
||||
exchange @oa_repair_request;
|
||||
message_kind Asynchronous;
|
||||
receiver none;
|
||||
reply_to none;
|
||||
sender none;
|
||||
values [];
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_field_procedure;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
sequence_link oa_repair_then_report "Sequence link: Report the measured result" id "c8196d35-2168-5fef-8b03-ba0d139bc00f" {
|
||||
description "";
|
||||
guard "";
|
||||
source @oa_repair_step;
|
||||
target @oa_report_step;
|
||||
}
|
||||
|
||||
sequence_link oa_request_then_repair "Sequence link: Repair the valve" id "3f54d890-4ca5-5e36-873b-abb5c92d578c" {
|
||||
description "";
|
||||
guard "";
|
||||
source @oa_request_step;
|
||||
target @oa_repair_step;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
oa_process oa_response "Handle a pressure alarm" id "58bae2b0-f560-50f2-818d-19091d22d18a" {
|
||||
description "";
|
||||
parent none;
|
||||
steps [@oa_assess_step, @oa_decision, @oa_reset_step, @oa_use_field, @oa_merge, @oa_confirm_step];
|
||||
}
|
||||
|
||||
@@ -10,23 +8,16 @@ oa_occurrence oa_assess_step "Assess the alarm" id "0b07b9ed-492d-57f6-b0b1-ce8a
|
||||
sequence @oa_assessment_procedure;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_response;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
oa_occurrence oa_confirm_step "Confirm safe pressure" id "e00594a3-6122-5a6b-b3c2-ecb5506c741d" {
|
||||
body {
|
||||
Action {
|
||||
action @oa_confirm;
|
||||
lifeline none;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_response;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
oa_occurrence oa_decision "Can a remote reset safely recover pressure?" id "b280c6ca-e5f9-5424-a5c1-5676e01c2371" {
|
||||
@@ -35,10 +26,7 @@ oa_occurrence oa_decision "Can a remote reset safely recover pressure?" id "b280
|
||||
kind Choice;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_response;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
oa_occurrence oa_merge "Recovery path completed" id "6b945a6d-6aa0-5dd3-96e6-2e8d757d167d" {
|
||||
@@ -47,23 +35,16 @@ oa_occurrence oa_merge "Recovery path completed" id "6b945a6d-6aa0-5dd3-96e6-2e8
|
||||
kind Merge;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_response;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
oa_occurrence oa_reset_step "Try the authorized remote reset" id "d2026fc2-74a8-5e22-9942-ff3eb68a3677" {
|
||||
body {
|
||||
Action {
|
||||
action @oa_reset;
|
||||
lifeline none;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_response;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
oa_occurrence oa_use_field "Use the field repair procedure" id "fc6763bf-a534-54bf-afcd-57ab285ff07d" {
|
||||
@@ -72,56 +53,42 @@ oa_occurrence oa_use_field "Use the field repair procedure" id "fc6763bf-a534-54
|
||||
sequence @oa_field_procedure;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_response;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
sequence_link oa_assess_then_decide "Continue" id "109e2d6b-7e86-5934-93a5-fab56eced84e" {
|
||||
description "";
|
||||
guard "";
|
||||
source @oa_assess_step;
|
||||
target @oa_decision;
|
||||
}
|
||||
|
||||
sequence_link oa_field_path "else" id "c1adbbd0-a762-5ee3-8b9a-5c18af377771" {
|
||||
description "";
|
||||
guard "else";
|
||||
source @oa_decision;
|
||||
target @oa_use_field;
|
||||
}
|
||||
|
||||
sequence_link oa_remote_path "remote reset is authorized" id "76218d89-68fd-531d-b35b-90c5b769a5ef" {
|
||||
description "";
|
||||
guard "remote reset is authorized";
|
||||
source @oa_decision;
|
||||
target @oa_reset_step;
|
||||
}
|
||||
|
||||
sequence_link oa_confirm_path "Continue" id "229ee94f-d147-50f6-9769-b5bd0c03a084" {
|
||||
description "";
|
||||
guard "";
|
||||
source @oa_merge;
|
||||
target @oa_confirm_step;
|
||||
}
|
||||
|
||||
sequence_link oa_remote_merge "Continue" id "bac43d3b-910b-5bdc-be9b-f78cf973e1ed" {
|
||||
description "";
|
||||
guard "";
|
||||
source @oa_reset_step;
|
||||
target @oa_merge;
|
||||
}
|
||||
|
||||
chain_involvement oa_response_delivery "Chain involvement: Restore a safe supply" id "c7c248f8-28b8-55be-9023-0991d44021e3" {
|
||||
description "";
|
||||
source @oa_response;
|
||||
target @oa_restore;
|
||||
}
|
||||
|
||||
sequence_link oa_field_merge "Continue" id "c8593670-8906-530f-b6a2-3ada77a9c219" {
|
||||
description "";
|
||||
guard "";
|
||||
source @oa_use_field;
|
||||
target @oa_merge;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
oa_scenario oa_conversation "Repair request and measured reply" id "20472233-5ce6-5ffe-b4ad-0bdbccf3e423" {
|
||||
context @oa_restore;
|
||||
description "";
|
||||
parent none;
|
||||
postcondition "The controller has received the measured pressure after repair";
|
||||
precondition "A pressure alarm has been assessed";
|
||||
steps [@oa_call, @oa_reply];
|
||||
@@ -14,23 +12,17 @@ oa_occurrence oa_call "Request valve repair" id "b97437c6-cd7a-5a05-b537-b30a17d
|
||||
exchange @oa_contact;
|
||||
message_kind Call;
|
||||
receiver @oa_responder;
|
||||
reply_to none;
|
||||
sender @oa_caller;
|
||||
values [{
|
||||
expression "420.0";
|
||||
field @oa_pressure_parameter;
|
||||
path [];
|
||||
}];
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_conversation;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
oa_lifeline oa_caller "Controller" id "41859a65-ded2-547b-ab03-14e2fa740cf9" {
|
||||
description "";
|
||||
parent @oa_conversation;
|
||||
represented @oa_control;
|
||||
}
|
||||
@@ -46,18 +38,13 @@ oa_occurrence oa_reply "Return pressure after repair" id "cc2d497a-fd15-5455-9ee
|
||||
values [{
|
||||
expression "320.0";
|
||||
field @oa_pressure_parameter;
|
||||
path [];
|
||||
}];
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_conversation;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
oa_lifeline oa_responder "Technician" id "fc81c5f0-0442-5b88-992b-e5b10f351c59" {
|
||||
description "";
|
||||
parent @oa_conversation;
|
||||
represented @oa_technician;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
oa_scenario oa_full_scenario "Restore supply through field repair" id "d6f881a4-95da-54e9-ad97-1b8965532629" {
|
||||
context @oa_restore;
|
||||
description "";
|
||||
parent none;
|
||||
postcondition "The controller has received the measured pressure after repair";
|
||||
precondition "A pressure alarm has been assessed";
|
||||
steps [@oa_use_conversation];
|
||||
@@ -9,13 +7,11 @@ oa_scenario oa_full_scenario "Restore supply through field repair" id "d6f881a4-
|
||||
}
|
||||
|
||||
oa_lifeline oa_outer_controller "Controller" id "2011b3ac-614b-5a47-8891-7ff81965f425" {
|
||||
description "";
|
||||
parent @oa_full_scenario;
|
||||
represented @oa_control;
|
||||
}
|
||||
|
||||
oa_lifeline oa_outer_technician "Technician" id "fffff882-78fd-5415-928d-c1ef7fac6576" {
|
||||
description "";
|
||||
parent @oa_full_scenario;
|
||||
represented @oa_technician;
|
||||
}
|
||||
@@ -33,9 +29,6 @@ oa_occurrence oa_use_conversation "Use the reviewed repair conversation" id "9ff
|
||||
scenario @oa_conversation;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent @oa_full_scenario;
|
||||
postcondition "";
|
||||
precondition "";
|
||||
}
|
||||
|
||||
|
||||
@@ -1,80 +1,43 @@
|
||||
oa_state_machine oa_monitor "Pressure supervision" id "1970608f-85d1-5234-ac86-5e2b0df27dc3" {
|
||||
description "";
|
||||
parent @oa_control;
|
||||
}
|
||||
|
||||
oa_region oa_monitor_region "Supervision cycle" id "8412e9c6-96fe-5ed6-a903-1d37ec3c3bf7" {
|
||||
description "";
|
||||
parent @oa_monitor;
|
||||
}
|
||||
|
||||
oa_initial oa_monitor_initial "Start" id "a7ffb869-9dde-5e76-b276-c719c5c143a9" {
|
||||
description "";
|
||||
do_activity "";
|
||||
entry "";
|
||||
exit "";
|
||||
kind Initial;
|
||||
parent @oa_monitor_region;
|
||||
}
|
||||
|
||||
oa_state oa_monitoring "Monitoring" id "6cbde0d8-9f5f-510a-a8c1-e29cb99ad4ae" {
|
||||
description "";
|
||||
do_activity "";
|
||||
entry "";
|
||||
exit "";
|
||||
kind State;
|
||||
parent @oa_monitor_region;
|
||||
}
|
||||
|
||||
oa_state oa_waiting "Awaiting repair" id "58c15833-6e75-523a-b57f-a88f19f6d672" {
|
||||
description "";
|
||||
do_activity "";
|
||||
entry "";
|
||||
exit "";
|
||||
kind State;
|
||||
parent @oa_monitor_region;
|
||||
}
|
||||
|
||||
state_transition oa_start_monitoring "State transition: Monitoring" id "2b00270c-79a5-52a5-af96-33346bea531b" {
|
||||
description "";
|
||||
effect "";
|
||||
effects [];
|
||||
guard "";
|
||||
source @oa_monitor_initial;
|
||||
target @oa_monitoring;
|
||||
transition_kind External;
|
||||
trigger "";
|
||||
triggers [];
|
||||
}
|
||||
|
||||
state_transition oa_alarm_transition "State transition: Awaiting repair" id "fbde9d5e-c7e9-55db-a2be-497345c491b3" {
|
||||
description "";
|
||||
effect "";
|
||||
effects [];
|
||||
guard "";
|
||||
source @oa_monitoring;
|
||||
target @oa_waiting;
|
||||
transition_kind External;
|
||||
trigger "";
|
||||
triggers [@oa_high_pressure];
|
||||
}
|
||||
|
||||
state_action oa_assess_on_entry "Assess when repair is needed" id "7fa37e63-db65-5aa7-88f2-31ff4347a787" {
|
||||
description "";
|
||||
phase Entry;
|
||||
source @oa_waiting;
|
||||
target @oa_assess;
|
||||
}
|
||||
|
||||
state_transition oa_normal_transition "State transition: Monitoring" id "21fe5e8e-cbc2-5dad-b3e8-1df46e167d97" {
|
||||
description "";
|
||||
effect "";
|
||||
effects [];
|
||||
guard "repair confirmed and pressure is safe";
|
||||
source @oa_waiting;
|
||||
target @oa_monitoring;
|
||||
transition_kind External;
|
||||
trigger "";
|
||||
triggers [];
|
||||
}
|
||||
|
||||
|
||||
@@ -1,26 +1,18 @@
|
||||
oa_mission oa_mission "Maintain safe water supply" id "c9c61f50-06e0-5d17-973d-dcc57cd5cc90" {
|
||||
description "";
|
||||
parent none;
|
||||
}
|
||||
|
||||
oa_capability oa_restore "Restore a safe supply" id "3dfee23a-148b-5cec-ad2d-b774e84ea5bb" {
|
||||
description "";
|
||||
parent none;
|
||||
}
|
||||
|
||||
oa_capability oa_triage "Assess an alarm" id "6a30b763-cc51-546d-907f-5c63657cfd03" {
|
||||
description "";
|
||||
parent none;
|
||||
}
|
||||
|
||||
mission_capability oa_mission_delivery "Mission capability: Restore a safe supply" id "1f8b1898-65f6-5360-99cf-b78a71bd50ec" {
|
||||
description "";
|
||||
source @oa_mission;
|
||||
target @oa_restore;
|
||||
}
|
||||
|
||||
capability_include oa_include_triage "Capability include: Assess an alarm" id "e21d9a54-ae8e-5618-a4f8-67ee22b92638" {
|
||||
description "";
|
||||
source @oa_restore;
|
||||
target @oa_triage;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
oa_exchange_category oa_contact_category "Field contact" id "19bd3a3a-4d0c-56d5-bf50-a6b43fd81771" {
|
||||
description "";
|
||||
exchanges [@oa_contact];
|
||||
family "Participant";
|
||||
parent none;
|
||||
}
|
||||
|
||||
oa_event oa_high_pressure "Pressure alarm detected" id "65d6b8d6-271a-5c84-8b42-abbe310c955e" {
|
||||
@@ -11,14 +9,9 @@ oa_event oa_high_pressure "Pressure alarm detected" id "65d6b8d6-271a-5c84-8b42-
|
||||
expression "measured_pressure > operating_limit";
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent none;
|
||||
}
|
||||
|
||||
oa_exchange_category oa_repair_traffic "Repair work exchanges" id "9349b353-53f2-56f8-b571-a05b09335cdf" {
|
||||
description "";
|
||||
exchanges [@oa_repair_request, @oa_repair_report];
|
||||
family "Work";
|
||||
parent none;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,59 +1,46 @@
|
||||
oa_entity oa_control "Control room" id "32aa9940-df6e-5a12-b9bd-6337e2d2ed22" {
|
||||
description "";
|
||||
parent none;
|
||||
}
|
||||
|
||||
oa_actor oa_technician "Field technician" id "e07c3952-4a1a-5cc7-b7d5-03a01101ce49" {
|
||||
description "";
|
||||
parent none;
|
||||
}
|
||||
|
||||
allocation oa_assess_allocation "Allocation: Assess pressure alarm" id "594c61cd-94e0-5c07-890d-edfd520d7df9" {
|
||||
description "";
|
||||
source @oa_control;
|
||||
target @oa_assess;
|
||||
}
|
||||
|
||||
allocation oa_confirm_allocation "Allocation: Confirm safe pressure" id "bfd4326e-ea65-5269-b5e6-e063a355d1e9" {
|
||||
description "";
|
||||
source @oa_control;
|
||||
target @oa_confirm;
|
||||
}
|
||||
|
||||
communication_mean oa_contact "Technician service conversation" id "27b47887-baf0-518b-bf87-f5acbf7d0b93" {
|
||||
description "";
|
||||
items [@oa_repair_operation];
|
||||
oriented false;
|
||||
source @oa_control;
|
||||
target @oa_technician;
|
||||
}
|
||||
|
||||
exchange_allocation oa_report_carriage "Exchange allocation: Report repair result" id "4549d3fa-5ab9-52a9-b4f9-3a78fc9d625a" {
|
||||
description "";
|
||||
source @oa_contact;
|
||||
target @oa_repair_report;
|
||||
}
|
||||
|
||||
exchange_allocation oa_request_carriage "Exchange allocation: Request field repair" id "094b888c-450c-5c4f-971a-7d75db059574" {
|
||||
description "";
|
||||
source @oa_contact;
|
||||
target @oa_repair_request;
|
||||
}
|
||||
|
||||
mission_involvement oa_mission_participant "Mission involvement: Maintain safe water supply" id "0c4c9e58-ff32-5c00-b82a-d408a4be0183" {
|
||||
description "";
|
||||
source @oa_control;
|
||||
target @oa_mission;
|
||||
}
|
||||
|
||||
allocation oa_reset_allocation "Allocation: Reset valve remotely" id "1853df1f-30f4-5b1a-baac-2dcaf73c7b3a" {
|
||||
description "";
|
||||
source @oa_control;
|
||||
target @oa_reset;
|
||||
}
|
||||
|
||||
allocation oa_repair_allocation "Allocation: Repair valve in the field" id "ae53f363-0dec-5a7c-9afd-8fcd1b778ab2" {
|
||||
description "";
|
||||
source @oa_technician;
|
||||
target @oa_repair;
|
||||
}
|
||||
|
||||
@@ -1,35 +1,22 @@
|
||||
oa_data_type oa_pressure "Measured pressure" id "e7824764-5db9-5384-8198-2fbaea2b10b2" {
|
||||
default none;
|
||||
definition {
|
||||
Real {
|
||||
maximum 600.0;
|
||||
minimum 0.0;
|
||||
};
|
||||
};
|
||||
description "";
|
||||
parent none;
|
||||
unit "kPa";
|
||||
}
|
||||
|
||||
oa_exchange_item oa_repair_operation "Valve repair" id "d736c7d6-d369-550a-8ba4-dae223e40bb3" {
|
||||
description "";
|
||||
kind Information;
|
||||
mechanism Operation;
|
||||
parent none;
|
||||
supertype none;
|
||||
}
|
||||
|
||||
oa_data_field oa_pressure_parameter "Pressure before / after repair" id "8bc6d0a4-3e87-559b-8bd7-1b679a2db5b7" {
|
||||
default none;
|
||||
description "";
|
||||
direction InOut;
|
||||
maximum 1;
|
||||
minimum 1;
|
||||
parent @oa_repair_operation;
|
||||
storage Value;
|
||||
type_ref {
|
||||
Named @oa_pressure;
|
||||
};
|
||||
unit "";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user