Merge branch 'S2C_delivery' into 'master'

S2C delivery

See merge request AIDA/AIDAArchitecture!2

AIDA/.user.af

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<vp:Workspace xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:vp="http://www.polarsys.org/kitalpha/ad/viewpoint/1.0.0"/>

Cameo models/Copyright - SAMARETO.txt

@@ -0,0 +1,9 @@
+/********************************************************************************************************
+* Copyright (c) {January 2021} {Samares-Engineering} [and Jean-Marie Gauthier]
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* SPDX-License-Identifier: EPL-2.0
+*********************************************************************************************************/

Cameo models/README.txt

@@ -0,0 +1,12 @@
+This model is the Cameo version of the version 4.4 of AIDA. It is made available under the termes below.
+
+/***************************************************************************************************************** 
+Copyright (c) 2021-2022 IRT AESE (IRT Saint Exup<75>ry).  
+
+All rights reserved. This program and the accompanying materials are made available under the terms of the Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) which accompanies this distribution, and is available at https://creativecommons.org/licenses/by-sa/4.0/  
+
+Contributors: Mirna OJEDA, Julie DE SOUSA, S<>bastien DUBE, Ida Electra DAHL, Mihir JOSHI 
+****************************************************************************************************************/
+
+It requires the usage of the SAMAREQ profile for Cameo Systems Modeller, which is available here :
+https://gitlab.com/samares-public/samareq-profile/

Capella models/AIDA - single model/.project

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AIDA-4.5-single_model</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.polarsys.capella.project.nature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

Capella models/AIDA - single model/AIDA.afm

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_Pj_RoGYMEeeYC6NJVLZvnQ">
+  <viewpointReferences id="_PqCPQGYMEeeYC6NJVLZvnQ" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
+  <viewpointReferences id="_nyYmcKy_EeqXA5wdFDfB8g" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_nzHmQKy_EeqXA5wdFDfB8g" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_R7cGUCK3Ee262Y-Rk7mvFw" vpId="org.polarsys.capella.vp.mass" version="5.0.0.qualifier"/>
+</metadata:Metadata>

Capella models/Extended enterprise split models/AIDA/.project

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AIDA_top_level</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.polarsys.capella.project.nature</nature>
+	</natures>
+</projectDescription>

Capella models/Extended enterprise split models/AIDA/AIDA.afm

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_Pj_RoGYMEeeYC6NJVLZvnQ">
+  <viewpointReferences id="_PqCPQGYMEeeYC6NJVLZvnQ" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
+  <viewpointReferences id="_nyYmcKy_EeqXA5wdFDfB8g" vpId="org.polarsys.kitalpha.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_nzHmQKy_EeqXA5wdFDfB8g" vpId="org.polarsys.capella.vp.requirements" version="0.12.2"/>
+  <viewpointReferences id="_W0XyECLhEe262Y-Rk7mvFw" vpId="org.polarsys.capella.vp.mass" version="5.0.0.qualifier"/>
+</metadata:Metadata>

Capella models/Extended enterprise split models/AIDA/Copyright

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018 IRT AESE (IRT Saint Exupéry).
+Copyright (c) 2016-2022 IRT AESE (IRT Saint Exupéry).
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the
 Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
@@ -6,4 +6,5 @@ which accompanies this distribution, and is available at
 https://creativecommons.org/licenses/by-sa/4.0/
 
 Contributors:
-Pierre Virelizier, Tatiana Prosvirnova, Estelle Saez – Initial contribution
+Pierre Virelizier, Tatiana Prosvirnova, Estelle Saez – Initial contribution
+Romaric Demachy - V4.4 system version

Capella models/Extended enterprise split models/AIDA_control_desk/.project

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AIDA_control_desk</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.polarsys.capella.project.nature</nature>
+	</natures>
+</projectDescription>

Capella models/Extended enterprise split models/AIDA_control_desk/AIDA_control_desk.afm

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_Pj_RoGYMEeeYC6NJVLZvnQ">
-  <viewpointReferences id="_PqCPQGYMEeeYC6NJVLZvnQ" vpId="org.polarsys.capella.core.viewpoint" version="5.0.0"/>
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_5_QEsLwFEey0bfuR-5-yfA">
+  <viewpointReferences id="_5_vz8LwFEey0bfuR-5-yfA" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
 </metadata:Metadata>

Capella models/Extended enterprise split models/AIDA_flight_control_system/.project

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AIDA_flight_control_system</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.polarsys.capella.project.nature</nature>
+	</natures>
+</projectDescription>

Capella models/Extended enterprise split models/AIDA_flight_control_system/AIDA_flight_control_system.afm

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_nvzNgLwMEey0bfuR-5-yfA">
+  <viewpointReferences id="_nwUx8LwMEey0bfuR-5-yfA" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
+  <viewpointReferences id="_QxRVQCLjEe262Y-Rk7mvFw" vpId="org.polarsys.capella.vp.mass" version="5.0.0.qualifier"/>
+</metadata:Metadata>

Capella models/Extended enterprise split models/AIDA_payload/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>AIDA-4.3</name>
+	<name>AIDA_payload</name>
 	<comment></comment>
 	<projects>
 	</projects>

Capella models/Extended enterprise split models/AIDA_payload/AIDA_payload.afm

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_XZX5ALwJEey0bfuR-5-yfA">
+  <viewpointReferences id="_XZ5dcLwJEey0bfuR-5-yfA" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
+  <viewpointReferences id="_517a4CLiEe262Y-Rk7mvFw" vpId="org.polarsys.capella.vp.mass" version="5.0.0.qualifier"/>
+</metadata:Metadata>

Capella models/Extended enterprise split models/AIDA_propulsion_unit/.project

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AIDA_propulsion_unit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.polarsys.capella.project.nature</nature>
+	</natures>
+</projectDescription>

Capella models/Extended enterprise split models/AIDA_propulsion_unit/AIDA_propulsion_unit.afm

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_ILbyYLwNEey0bfuR-5-yfA">
+  <viewpointReferences id="_IMHu4LwNEey0bfuR-5-yfA" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
+  <viewpointReferences id="_dT16cCLiEe262Y-Rk7mvFw" vpId="org.polarsys.capella.vp.mass" version="5.0.0.qualifier"/>
+</metadata:Metadata>

Capella models/Extended enterprise split models/AIDA_remote_control/.project

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AIDA_remote_control</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.polarsys.capella.project.nature</nature>
+	</natures>
+</projectDescription>

Capella models/Extended enterprise split models/AIDA_remote_control/AIDA_remote_control.afm

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_3uxGQLv5Eey0bfuR-5-yfA">
+  <viewpointReferences id="_3vQ1gLv5Eey0bfuR-5-yfA" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
+</metadata:Metadata>

readme.txt

@@ -28,7 +28,7 @@ The quadcopter drone can be piloted in automated or manual mode. In manual mode,
 the pilot guides the inspection of the aircraft by the drone. 
 In automated mode, the drone follows a flight plan and records the video of the inspected zone.
 
-System architecture version: V4.3
+System architecture version: V4.5
 
 ************************************************************************
 * 2. Motivation and intended use
@@ -46,14 +46,26 @@ In: Bozzano, M., Papadopoulos, Y. (eds.) Model-Based Safety and Assessment - 5th
 Lecture Notes in Computer Science, vol. 10437, pp. 19-34. Springer (2017),
 https://doi.org/10.1007/978-3-319-64119-5_2
 
+Romaric Demachy, S<>bastien Guilmeau. Structural consistency of MBSE and MBSA models using Consistency Links. 
+11th European Congress Embedded Real Time System ( ERTS 2022 ), Jun 2022, Toulouse, France.
+https://hal.archives-ouvertes.fr/hal-03697170/
+
 ************************************************************************
 * 3. List of files and how to use them
 ************************************************************************
 
-- AIDA folder : contains the Capella model. Required environment : Capella 5.0 with the following add-ons : PVMT + Diagram Styler
+- Capella model : contains the Capella models. Required environment : Capella 5.2 with the following add-ons : PVMT + Diagram Styler
 (See https://www.eclipse.org/capella/download.html and https://www.eclipse.org/capella/addons.html)
+	- The "AIDA - single model" folder contains the monolythic Capella model of the whole AIDA system
+	- The "Extended enterprise split models" contains the models splits according to the chosen extended enterprise context :
+		- AIDA contains the top-level model, in which the sub-systems are "black boxes"
+		- The other models are dedicated to the detail design of each sub-system
+
+- Cameo model : This model shall be edited with Cameo Systems Modeller V19.0 SP2/3. This model contains an execution capability, which requires the appropriate license.
 
 - AIDA_Model_Description : synthetic description of the model content
+
+- AIDA Architecture synthesis : complete description of the AIDA system architecture and modelling in Capella
 		
 
 ************************************************************************
@@ -71,5 +83,19 @@ and is available at https://creativecommons.org/licenses/by-sa/4.0/
 
 Contributors:
 Pierre Virelizier, Tatiana Prosvirnova, Estelle Saez <20> Initial contribution
+Romaric Demachy - V4.4 and V4.5 system versions
+
+Third party components :
+The Cameo model uses components available under the following terms
+
+/********************************************************************************************************
+* Copyright (c) {January 2021} {Samares-Engineering} [and Jean-Marie Gauthier]
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* SPDX-License-Identifier: EPL-2.0
+*********************************************************************************************************/
 
 Contact :systems-engineering@irt-saintexupery.com