diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..fdd42ae
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,52 @@
+## Description
+
+Please indicate whether this pull request [adds/removes/fixes/replaces] the [feature/bug/etc].
+
+## What type of pull request is this? (check all applicable)
+
+- [ ] Feature
+- [ ] Bug Fix
+- [ ] Documentation Update
+- [ ] Style
+- [ ] Code Refactor
+- [ ] Performance Improvements
+- [ ] Test
+- [ ] Build
+- [ ] CI
+- [ ] Chore (Release)
+- [ ] Revert
+
+## Related Tickets & Documents
+
+If possible ensure that you have provided in your commit message the issue id (available [here](https://github.com/onera/pml-analyzer/issues)) this pull request fixes,
+for instance to refer to issue #42 you can do:
+```shell
+git commit -m "solving issue #42 with ..."
+```
+Check [here](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) for more information
+
+## Added tests?
+
+- [ ] yes
+- [ ] no, because they aren't needed
+- [ ] no, because I need help
+
+## Added to documentation?
+
+- [ ] README.md
+- [ ] doc
+- [ ] no documentation needed
+
+## Do we need to update pml analyzer version?
+
+- [ ] no
+- [ ] the pull request is only a bug fix, need a bug fix version update
+- [ ] the pull request add new features and ensures retro-compatibility, need a feature addition version update
+- [ ] the pull request is not ensuring retro-capatibility, need a major version update
+- [ ] not sure, I need help
+
+## Is this new version should be released as soon as possible?
+
+- [ ] yes
+- [ ] no
+- [ ] not sure, I need help
diff --git a/README.md b/README.md
index 9e56e9d..c8e5373 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,23 @@
# PML analyzer
-The PML analyzer is an open source API providing a simple DSL to build
-a description of the architecture of your chip based on the PHYLOG Model Language (PML).
-From this representation a set of safety and interference model templates can be generated to perfom safety and
+The PML analyzer is an open source API providing a simple DSL to build
+a description of the architecture of your chip based on the PHYLOG Model Language (PML).
+From this representation a set of safety and interference model templates can be generated to perfom safety and
interference analyses of your platform.
The only dependencies of the PML analyzer are:
+ The Java Runtime Environment version 8 [JRE 1.8](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) or newer.
+ The Simple Build Tool [SBT](https://www.scala-sbt.org/)
+## Configurations
+
+### build.sbt
+
+To get the version X.Y.Z of pml analyzer simply add the following line to your build.sbt file:
+```scala
+libraryDependencies += "io.github.onera" % "pml_analyzer" % "X.Y.Z"
+```
+
## Installing dependencies
### Java 8
@@ -36,6 +45,13 @@ java -jar -Djava.library.path=yourPath sbt-launch.jar
# to run a JAR
java -jar -Djava.library.path=yourPath youJar.jar
```
+### Cecilia
+
+It is possible to export PML models as [CeciliaOCAS](https://satodev.com/nos-produits/cecilia-workshop/) or [OpenAltarica](https://www.openaltarica.fr/docs-downloads/) models and perform automatic analyses or simulation out of these models.
+
+### IDP
+
+It is possible to use [IDP](https://dtai.cs.kuleuven.be/software/idp/try) as an alternative to MONOSAT to perform the interference analyses out of your PML model.
## Using the PML analyzer
@@ -51,14 +67,10 @@ or unlinking entities) are provided in the ``pml.operators`` package.
Exporters to [yuml](https://yuml.me/diagram) and [graphviz](http://www.graphviz.org/) are provided in the ``pml.exporters`` package.
The compilation of a PML model can be easily perform with [SBT](https://www.scala-sbt.org/)
-+ First launch sbt in the project repository (this operation may take some time)
-```sbtshell
- sbt
+Simply run the following command in the project repository (this operation may take some time)
+```shell
+ sbt runMain pathToYourModel
```
-+ Once sbt is ready to receive command launch the compilation and execution of your PML model
-```sbtshell
- runMain pathToYourModel
- ```
### Editing a PML Model
@@ -75,8 +87,8 @@ your modeling activity.
To edit PML model with Intellij please follow the installation steps given by [JetBrain](https://www.jetbrains.com).
The installation can be made for any platform and does not require any administrator privilege.
-Once the Intellij is installed please download the Scala and SBT Executor plugins.
-
+Once the Intellij IDE is installed please download the Scala and SBT Executor plugins.
+More information are available on the [Intellij Scala 3 support guide](https://dotty.epfl.ch/3.0.0/docs/usage/ide-support.html)
#### Creating a project with Intellij
The build specifications and project structure are provided with the PML source code.
@@ -101,7 +113,7 @@ dynamic library of monosat by editing your run configuration and adding to VM op
#### Argumentation patterns
-The justification patterns considered for the CAST32-A are provided in the ``views.patterns`` package.
+The justification patterns considered for the AMC20-193 (former CAST32-A) are provided in the ``views.patterns`` package.
These patterns can be used as a starting point to start your argumentation activity.
To compile and run the PHYLOG patterns example please enter the following commands:
@@ -116,7 +128,7 @@ your modeling activity.
To compile and run the Keystone example please enter the following commands:
```sbtshell
- sbt runMain pml.examples.keystone.SimpleKeystoneExport
+ sbt runMain pml.examples.simpleKeystone.SimpleKeystoneExport
```
#### Analysis
@@ -124,8 +136,8 @@ For each view (interference, patterns and dependability) examples are provided i
These benchmarks can be used as a starting point to
your analysis activity. For instance, we can carry out the interference analysis of the Keystone platform with
```sbtshell
- # example of a PML model where an IDP interference model is generated
- sbt runMain views.interference.examples.SimpleKeystoneInterferenceGeneration
+ # example of a PML model where a MONOSAT based interference identification is performed
+ sbt runMain views.interference.examples.simpleKeystone.SimpleKeystoneInterferenceGeneration
```
If the tool is running on a Unix System you can use the Makefile to compile the DOT and LaTeX generated file:
@@ -140,7 +152,7 @@ make patterns
make png
```
-### Packaging
+### Package your model
All projects can be packaged into a single FATJAR containing all non-native dependencies.
The available projects can be obtained by running:
@@ -157,12 +169,4 @@ The resulting FATJAR will be produced in projectName/target/scala3.2.2
If your system contains a docker engine, you can build a docker image by running the following command:
```sbtshell
sbt docker
-```
-
-### External tools
-
-The PML modeling does not rely on any external dependency. Nevertheless, it is possible
-to connect some backend analysis tools to directly perform analyses out of your PML model:
- * for interference analysis: [IDP](https://dtai.cs.kuleuven.be/software/idp/try) or [Monosat](https://github.com/sambayless/monosat)
- * for the safety analysis: [CeciliaOCAS]() or [OpenAltarica](https://www.openaltarica.fr/docs-downloads/)
-
+```
\ No newline at end of file
diff --git a/build.sbt b/build.sbt
index 50474d0..98116df 100644
--- a/build.sbt
+++ b/build.sbt
@@ -87,8 +87,18 @@ lazy val assemblySettings = Seq(
//Definition of the common settings for the projects (ie the scala version, compilation options and library resolvers)
lazy val commonSettings = Seq(
- organization := "onera",
- version := "1.0.0",
+ organization := "io.github.onera",
+ homepage := Some(url("https://github.com/onera/pml-analyzer")),
+ scmInfo := Some(ScmInfo(url("https://github.com/onera/pml-analyzer"), "git@github.com:onera/pml-analyzer.git")) ,
+ developers := List (Developer("kevin-delmas", "kevin-delmas", "kevin.delmas@onera.fr", url("https://www.onera.fr/en/staff/kevin-delmas"))) ,
+ licenses +=("LGPL-2.1", url("https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html")) ,
+ publishMavenStyle := true,
+ credentials += Credentials(Path.userHome / ".sbt" / "sonatype_credentials"),
+ pomIncludeRepository := { _ => false },
+ crossPaths := false,
+ publishTo := Some("releases" at "https://s01.oss.sonatype.org/" + "service/local/staging/deploy/maven2"),
+ publishMavenStyle := true,
+ version := "1.0.1",
scalaVersion := "3.2.2",
sbtVersion := "1.8.2",
scalacOptions := Seq("-unchecked", "-deprecation", "-feature"),
diff --git a/contributing.md b/contributing.md
new file mode 100644
index 0000000..79c6c25
--- /dev/null
+++ b/contributing.md
@@ -0,0 +1,90 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change.
+
+## Pull Request Process
+
+1. Fork, then clone the repo:
+```shell
+git clone git@github.com:your-username/pml-analyzer.git
+```
+2. See README.md to set up your machine.
+3. Make sure the tests pass:
+```shell
+sbt test
+```
+4. Make your change and please follow the [Scala 3 coding and documentation style guide](https://docs.scala-lang.org/style/).
+5. Add tests for your change. Make the tests pass:
+```shell
+sbt test
+```
+6. Update the README.md with details of changes to the API or the analysis process.
+7. Increase the version numbers in any examples files, the README.md and the build.sbt to the new version that this
+ Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
+```scala
+//Change version in build.sbt
+version := "X.Y.Z"
+```
+8. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
+ do not have permission to do that, you may request the second reviewer to merge it for you.
+
+## Code of Conduct
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
\ No newline at end of file
diff --git a/doc/_assets/images/phylog_logo.gif b/doc/_assets/images/phylog_logo.gif
index e69de29..bbb4abe 100644
Binary files a/doc/_assets/images/phylog_logo.gif and b/doc/_assets/images/phylog_logo.gif differ
diff --git a/doc/_assets/images/simpleKeystone/interference.PNG b/doc/_assets/images/simpleKeystone/interference.PNG
index e69de29..14dc0dd 100644
Binary files a/doc/_assets/images/simpleKeystone/interference.PNG and b/doc/_assets/images/simpleKeystone/interference.PNG differ
diff --git a/doc/_assets/images/simpleKeystone/platform.PNG b/doc/_assets/images/simpleKeystone/platform.PNG
index e69de29..063291d 100644
Binary files a/doc/_assets/images/simpleKeystone/platform.PNG and b/doc/_assets/images/simpleKeystone/platform.PNG differ
diff --git a/doc/_assets/images/simpleKeystone/temporal_slices.PNG b/doc/_assets/images/simpleKeystone/temporal_slices.PNG
index e69de29..e9c47b0 100644
Binary files a/doc/_assets/images/simpleKeystone/temporal_slices.PNG and b/doc/_assets/images/simpleKeystone/temporal_slices.PNG differ
diff --git a/doc/_assets/images/simpleKeystone/transactions.PNG b/doc/_assets/images/simpleKeystone/transactions.PNG
index e69de29..0c5169a 100644
Binary files a/doc/_assets/images/simpleKeystone/transactions.PNG and b/doc/_assets/images/simpleKeystone/transactions.PNG differ
diff --git a/doc/_assets/images/simpleKeystone/transactions_footprint.PNG b/doc/_assets/images/simpleKeystone/transactions_footprint.PNG
index e69de29..6404603 100644
Binary files a/doc/_assets/images/simpleKeystone/transactions_footprint.PNG and b/doc/_assets/images/simpleKeystone/transactions_footprint.PNG differ
diff --git a/doc/_assets/images/simpleT1042/interference.PNG b/doc/_assets/images/simpleT1042/interference.PNG
index e69de29..5562679 100644
Binary files a/doc/_assets/images/simpleT1042/interference.PNG and b/doc/_assets/images/simpleT1042/interference.PNG differ
diff --git a/doc/_assets/images/simpleT1042/platform.PNG b/doc/_assets/images/simpleT1042/platform.PNG
index e69de29..57e7d20 100644
Binary files a/doc/_assets/images/simpleT1042/platform.PNG and b/doc/_assets/images/simpleT1042/platform.PNG differ
diff --git a/doc/_assets/images/simpleT1042/transactions.PNG b/doc/_assets/images/simpleT1042/transactions.PNG
index e69de29..5583fb9 100644
Binary files a/doc/_assets/images/simpleT1042/transactions.PNG and b/doc/_assets/images/simpleT1042/transactions.PNG differ
diff --git a/doc/_assets/text/rootContent.txt b/doc/_assets/text/rootContent.txt
index e69de29..453a101 100644
--- a/doc/_assets/text/rootContent.txt
+++ b/doc/_assets/text/rootContent.txt
@@ -0,0 +1,4 @@
+The PML analyzer is an open source API providing a simple DSL to build
+a description of the architecture of your chip based on the PHYLOG Model Language (PML).
+From this representation a set of safety and interference model templates can be generated to perfom safety and
+interference analyses of your platform.
\ No newline at end of file
diff --git a/doc/_docs/example/simpleKeystone/export.md b/doc/_docs/example/simpleKeystone/export.md
index e69de29..e410696 100644
--- a/doc/_docs/example/simpleKeystone/export.md
+++ b/doc/_docs/example/simpleKeystone/export.md
@@ -0,0 +1,35 @@
+---
+layout: doc-page
+title: "Exports"
+---
+
+### Configured platform
+
+The file src/main/scala/pml/examples/simple/SimpleExport shows how graphical exports are produced (stored in export folder)
+from a platform:
+* graph of used SW and HW
+* graph of used services per application
+* table of transaction
+* table of data
+* table of SW allocation to HW
+* table of component activation
+* table of SW usage
+* routing table
+* transfert table
+
+### Interference analysis
+
+The file src/main/scala/views/interference/examples/SimpleInterferenceGeneration shows how interference analysis can be performed
+on a configured platform. The generated files are stored in analysis folder:
+* computation of n-itf
+* computation of n-free
+* computation of n-channels
+
+As an example the following interference is identified as a 3-itf in the first time slice:
+
+< app1_wr_d2 || app21_wr_d1 || app4_wr_input_d >
+
+
+
+Figure 5: Example of footprint and interference channel (identified by the two circles)
+
diff --git a/doc/_docs/example/simpleKeystone/index.md b/doc/_docs/example/simpleKeystone/index.md
index e69de29..b9e9595 100644
--- a/doc/_docs/example/simpleKeystone/index.md
+++ b/doc/_docs/example/simpleKeystone/index.md
@@ -0,0 +1,12 @@
+---
+layout: index
+---
+
+This section provides a simple yet comprehensive example of a processor PML model composed of:
+* two cores,
+* one DMA (Direct Access Memory),
+* one Ethernet device,
+* one DDR and SRAM memory,
+* one SPI controller,
+* an interrupt controller (MPIC),
+* and a set of configuration registers reachable through a specific configuration bus.
diff --git a/doc/_docs/example/simpleKeystone/library.md b/doc/_docs/example/simpleKeystone/library.md
index e69de29..4aaaaf2 100644
--- a/doc/_docs/example/simpleKeystone/library.md
+++ b/doc/_docs/example/simpleKeystone/library.md
@@ -0,0 +1,33 @@
+---
+layout: doc-page
+title: "Transaction library"
+---
+
+The application layer is composed of five tasks:
+* app4 is an asynchronous microcode running on the Ethernet component.
+ Each time an Ethernet frame arrives, it transfers the payload of the frame to SRAM (transaction t41).
+* app21 and app22 are two periodic tasks running core1.
+* * At each period app21 reads the last Ethernet message from SRAM,
+ makes some input treatments on the message, and makes it available for app1 in DDR.
+* * Similarly, at each period app22 reads output data of app1 from DDR. It transforms them into SPI frames.
+ The frames are then store in SRAM. And finally app22 wakes up the DMA (app3)
+ by writing the address of the SPI frames into the DMA registers.
+* app3 is a microcode running on DMA. When woke up, app3 reads the SPI frame from
+ SRAM and transfers it to SPI.
+* app1 is an asynchronous applicative task running on core0 and activated each time a external interrupt arrives.
+ It begins by reading the interrupt code from MPIC (transaction t11).
+ It reads its input data from DDR (transaction t12).
+ Then it runs using the internal cache of core0 (transaction t13).
+ And finally it stores its output data in DDR (transaction t14).
+
+The transactions are drawn in Figure 2.
+
+
+
+Figure 2: Transactions of app1, app21 app22, app3,and app4.
+
+By design, app22 and app3 do not run simultaneously, as app22 wakes up app3 at the end of its execution.
+
+PML Encoding is provided in src/main/scala/pml/examples/simple/SimpleTransactionLibrary.scala
+
+In this example all defined transaction are used, the configuration of the library is provided in src/main/scala/examples/simple/SimpleLibraryConfiguration
diff --git a/doc/_docs/example/simpleKeystone/platform.md b/doc/_docs/example/simpleKeystone/platform.md
index e69de29..afa5a5f 100644
--- a/doc/_docs/example/simpleKeystone/platform.md
+++ b/doc/_docs/example/simpleKeystone/platform.md
@@ -0,0 +1,27 @@
+---
+layout: doc-page
+title: "Platform"
+---
+
+As shown in Figure 1 the two core are linked by an
+AXI bus. The IO devices (DMA, Ethernet controler and SPI) are
+linked through a dedicated peripheral bus. These two buses are
+connected to the memory subsystem (containing the DDR and
+the SRAM memories) through a dedicated controller
+called Memory Shared Multicore Controller (MSMC). This controller
+acts as a switch from the two buses to the two memories.
+
+All the resources necessary for executing program instructions are locally hosted by each core: ordinal counter, registers, computing units, etc.
+These resources are private to each core.
+They can be used simultaneously without interference by each core.
+Conversely, the memory hierarchy is composed of resources local
+to each core (the cache memories), and also global
+resources (such as DDR and SRAM) simultaneously reachable
+by the cores and the IO devices.
+These global memories are shared resources.
+
+
+
+Figure 1: Multicore processor
+
+PML Encoding is provided in src/main/scala/pml/examples/simpleKeystone/SimpleKeystonePlatform.scala
\ No newline at end of file
diff --git a/doc/_docs/example/simpleKeystone/routing.md b/doc/_docs/example/simpleKeystone/routing.md
index e69de29..46eff15 100644
--- a/doc/_docs/example/simpleKeystone/routing.md
+++ b/doc/_docs/example/simpleKeystone/routing.md
@@ -0,0 +1,12 @@
+---
+layout: doc-page
+title: "Routing"
+---
+
+
+In this example, as shown in Figure 1, there are multiple paths between the cores and the configuration registers.
+These registers can be reached from the core either through AXI-BUS, MSMC, PERIPH-BUS and CONFIG-BUS, or directly through CONFIG-BUS.
+The platform is configured such that the read and store accesses by the core to the configuration registers are routed through the
+the direct path.
+
+The PML routing rules are encoded in src/main/scala/pml/examples/simple/SimpleRoutingConfiguration.scala
diff --git a/doc/_docs/example/simpleKeystone/slicing.md b/doc/_docs/example/simpleKeystone/slicing.md
index e69de29..5d7f594 100644
--- a/doc/_docs/example/simpleKeystone/slicing.md
+++ b/doc/_docs/example/simpleKeystone/slicing.md
@@ -0,0 +1,22 @@
+---
+layout: doc-page
+title: "Temporal slices"
+---
+
+The tasks are scheduled into two periodic time slices as shown in Figure 3:
+app4 and app21 are scheduled in the first time slice;
+app22 and app3 are scheduled in the second time slice;
+and as app1 is asynchronous, it can run at any time, that is, possibly in the both slices.
+
+
+
+Figure 3: Temporal scheduling.
+
+The footprint of the transactions of these five tasks on the architecture is shown of each time slice in Figure 4.
+
+
+
+Figure 4: Footprint of the transactions on the HW architecture (the red, violet, blue, and green arrows represent respectively the transactions of app1, app2 (app21, app22), app3, and app3).
+
+The PML encoding of the first time slice is provided in src/main/scala/pml/examples/simple/SimpleKeystoneLibraryConfigurationPalnApp21.scala,
+and the second time slice is provided in src/main/scala/pml/examples/simple/SimpleKeystoneLibraryConfigurationPalnApp22.scala
diff --git a/doc/_docs/example/simpleKeystone/software.md b/doc/_docs/example/simpleKeystone/software.md
index e69de29..946c10b 100644
--- a/doc/_docs/example/simpleKeystone/software.md
+++ b/doc/_docs/example/simpleKeystone/software.md
@@ -0,0 +1,13 @@
+---
+layout: doc-page
+title: "Software Allocation"
+---
+
+The application layer is composed of five tasks:
+* app4 is an asynchronous microcode running on the eth component.
+* app21 is a periodic task running on core2.
+* app22 is a periodic task running on core2.
+* app3 a microcode running on DMA.
+* app1 is an asynchronous applicative task running on core1.
+
+PML Encoding is provided in src/main/scala/pml/examples/simple/SimpleSoftwareAllocation.scala
diff --git a/doc/_docs/example/simpleKeystone/specification.md b/doc/_docs/example/simpleKeystone/specification.md
index e69de29..e33ca38 100644
--- a/doc/_docs/example/simpleKeystone/specification.md
+++ b/doc/_docs/example/simpleKeystone/specification.md
@@ -0,0 +1,12 @@
+---
+layout: doc-page
+title: "Specifications"
+---
+
+In this example we consider that
+* bus services are independent
+* DMA and dma-reg services impacts each others
+* app21 and app22 are exclusive as they run on the same core
+* app22 and app3 are exclusive as app22 wakes up app3 at the en of its execution.
+
+PML encoding is provided in src/main/scala/views/interference/examples/simple/SimpleTableBasedInterferenceSpecification
diff --git a/doc/_docs/example/simpleT1042/index.md b/doc/_docs/example/simpleT1042/index.md
index e69de29..e1ce049 100644
--- a/doc/_docs/example/simpleT1042/index.md
+++ b/doc/_docs/example/simpleT1042/index.md
@@ -0,0 +1,106 @@
+---
+layout: index
+---
+
+## Platform
+
+This processor is composed of:
+* two cores,
+* one DMA (Direct Access Memory),
+* one Ethernet device,
+* two memory controllers (the memories behind the memory controllers are not represented),
+* one PCIe controller,
+* an interrupt controller (MPCI),
+* and a set of configuration registers reachable through a specific configuration bus.
+
+All the resources necessary for executing program instructions are locally hosted by each core: ordinal counter, registers, computing units, etc.
+These resources are private to each core.
+They can be used simultaneously without interference by each core.
+Conversely, the memory hierarchy is composed of resources local to each core (the cache memories), and two global memories reachable from the two cores.
+These global memories are shared resources.
+
+The cores, the Ethernet device, the DMA, and the memories are connected by a central bus as shown in Figure 1.
+This bus carries transactions, that is, requests from the cores, the Ethernet port, and the DMA to the memories and to the configuration bus.
+As such, the central bus is a shared resource that can be used asynchronously by the transactions.
+These transactions can collide when attempting to cross the bus at the same time.
+
+
+
+Figure 1: Multicore processor
+
+PML Encoding is provided in src/main/scala/pml/examples/simple/SimplePlatform.scala
+
+## Software Allocation
+
+The application layer is composed of five tasks:
+* app4 is an asynchronous microcode running on the eth component.
+* app21 is a periodic task running on core2.
+* app22 is a periodic task running on core2.
+* app3 a microcode running on DMA.
+* app1 is an asynchronous applicative task running on core1.
+
+PML Encoding is provided in src/main/scala/pml/examples/simple/SimpleSoftwareAllocation.scala
+
+## Transaction library
+
+The application layer is composed of five tasks:
+* app4 Each time an Ethernet frame arrives, it transfers the payload of the frame to mem2 (transaction t41).
+* app21 is a periodic task running on core2. At each period app21 reads the last Ethernet message from mem2, makes some input treatments on it, and makes it available for app1 in mem1.
+* app22 is a periodic task running on core2. Similarly, at each period app22 reads output data of app1 from mem1. It transforms them into PCIe frames. The frames are then store in mem2.
+* app22 wakes up the DMA (app3) by writing the address of the PCIe frames into the DMA registers.
+* app3 a microcode running on DMA. When woke up, app3 reads the PCIe frame from mem2 and transfers it to pcie.
+* app1 is an asynchronous applicative task running on core1 and activated each time an external interrupt arrives. It begins by reading the interrupt code from mpic (transaction t11). It reads its input data from mem1 (transaction t12). Then it runs using the internal cache of core1(transaction t13). And finally it stores its output data in mem1(transaction t14).
+
+
+
+Figure 2: Transactions of the HW architecture (the red, violet,blue, and green arrows represent respectively the transactions of app1,app2(app21 app22), app3,and app4).
+
+PML Encoding is provided in src/main/scala/pml/examples/simple/SimpleTransactionLibrary.scala
+
+In this example all defined transaction are used, the configuration of the library is provided in src/main/scala/examples/simple/SimpleLibraryConfiguration
+
+## Routing
+
+In this example there are not multiple paths between target and initiators so the routing configuration is optional (here empty)
+
+## Specifications
+
+In this example we consider that
+* bus services are independent
+* DMA and config_bus services impacts each others
+* app21 and app22 are exclusive
+
+PML encoding is provided in src/main/scala/views/interference/examples/simple/SimpleTableBasedInterferenceSpecification
+
+## Exports
+
+### Configured platform
+
+The file src/main/scala/pml/examples/simple/SimpleExport shows how graphical exports are produced (stored in export folder)
+from a platform:
+* graph of used SW and HW
+* graph of used services per application
+* table of transaction
+* table of data
+* table of SW allocation to HW
+* table of component activation
+* table of SW usage
+* routing table
+* transfert table
+
+### Interference analysis
+
+The file src/main/scala/views/interference/examples/SimpleInterferenceGeneration shows how interference analysis can be performed
+on a configured platform. The generated files are stored in analysis folder:
+* computation of n-itf
+* computation of n-free
+* computation of n-channels
+
+As an example the following interference is identified as a 3-itf
+
+< app1_rd_d1 || app21_wr_d1 || app4_wr_input_d >
+
+
+
+Figure 3: Footprint and interference channel (identified by the two circles)
+
diff --git a/doc/_docs/index.md b/doc/_docs/index.md
index e69de29..2bd15a1 100644
--- a/doc/_docs/index.md
+++ b/doc/_docs/index.md
@@ -0,0 +1,12 @@
+---
+layout: index
+---
+
+The PML analyzer is an open source API providing a simple DSL to build
+a description of the architecture of your chip based on the PHYLOG Model Language (PML).
+From this representation a set of safety and interference model templates can be generated to perfom safety and
+interference analyses of your platform.
+
+The only dependencies of the PML analyzer are:
++ The Java Runtime Environment version 8 [JRE 1.8](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) or newer.
++ The Simple Build Tool [SBT](https://www.scala-sbt.org/)
\ No newline at end of file
diff --git a/doc/_docs/reference/gettingStarted/external_dependency.md b/doc/_docs/reference/gettingStarted/external_dependency.md
index e69de29..c0b8b22 100644
--- a/doc/_docs/reference/gettingStarted/external_dependency.md
+++ b/doc/_docs/reference/gettingStarted/external_dependency.md
@@ -0,0 +1,19 @@
+---
+layout: doc-page
+title: "External Dependencies"
+---
+
+The PML modeling does not rely on any external dependency. Nevertheless, it is possible
+to connect some backend analysis tools to directly perform analyses out of your PML model:
+* for interference analysis: [IDP](https://dtai.cs.kuleuven.be/software/idp/try) or [Monosat](https://github.com/sambayless/monosat)
+* for the safety analysis: [CeciliaOCAS]() or [OpenAltarica](https://www.openaltarica.fr/docs-downloads/)
+
+The Monosat tool can be integrated as a dynamic library. To do so be sure that the library (.so for Linux,
+.dylib for Mac, .dll for Windows) is accessible from the java library path. If not update it by running sbt or the executable with the VM option:
+```shell
+# to run SBT with a given library path
+java -jar -Djava.library.path=yourPath sbt-launch.jar
+
+# to run a JAR
+java -jar -Djava.library.path=yourPath youJar.jar
+```
\ No newline at end of file
diff --git a/doc/_docs/reference/gettingStarted/getting_started_SBT.md b/doc/_docs/reference/gettingStarted/getting_started_SBT.md
index e69de29..83e9738 100644
--- a/doc/_docs/reference/gettingStarted/getting_started_SBT.md
+++ b/doc/_docs/reference/gettingStarted/getting_started_SBT.md
@@ -0,0 +1,26 @@
+---
+layout: doc-page
+title: "Installing dependencies"
+---
+
+The PML analyzer is an open source API providing a simple DSL to build
+a description of the architecture of your chip based on the PHYLOG Model Language (PML).
+From this representation a set of safety and interference model templates can be generated to perfom safety and
+interference analyses of your platform.
+
+The only dependencies of the PML analyzer are:
++ The Java Runtime Environment version 8 [JRE 1.8](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) or newer.
++ The Simple Build Tool [SBT](https://www.scala-sbt.org/)
+
+### Java 8
+
+You need a working installation of the Java Runtime Environment
+version 8 (either OpenJDK or Oracle will do). Installation procedures
+may vary depending on your system (Windows, OSX, Linux), please follow
+the official guidelines for your system.
+
+### SBT
+
+The compilation of a PML model can be easily performed
+with [SBT](https://www.scala-sbt.org/). Installation procedures may vary depending on your system (Windows, OSX, Linux),
+please follow the official guidelines for your system.
\ No newline at end of file
diff --git a/doc/_docs/reference/gettingStarted/getting_started_docker.md b/doc/_docs/reference/gettingStarted/getting_started_docker.md
index e69de29..80fe1b8 100644
--- a/doc/_docs/reference/gettingStarted/getting_started_docker.md
+++ b/doc/_docs/reference/gettingStarted/getting_started_docker.md
@@ -0,0 +1,111 @@
+---
+layout: doc-page
+title: "Getting started with Docker"
+---
+
+The simplest way to use PML Analyzer is to download a pre-configured Docker image to run interference analyses.
+The only dependency is the [Docker execution engine](https://docs.docker.com/get-docker/).
+Docker enables you to create from this image a container where all dependencies have been already resolved.
+### Container for a simple execution of PML examples
+The following commands create a simple container that can be used to run the examples provided in PML Analyzer.
+```shell
+# load directly the archive containing the image of the preconfigured PML Analyzer environment
+docker load < [IMAGE_NAME].tar.gz
+
+# The image has been configured to run as a non-root user
+# To share content between the container and the host, it is mandatory to create
+# the directories upfront with the write rights
+mkdir [PATH_TO_SHARED_FOLDER]/[SHARED_FOLDER_NAME]
+chmod -R a+w [PATH_TO_ANALYSIS_RESULT]/[SHARED_FOLDER_NAME]
+
+# In particular, it is interesting to share a folder to store the interference analysis results [PATH_TO_ANALYSIS_RESULT]
+# and to share a folder to store the export results [PATH_TO_EXPORT_RESULT]
+
+# To run a 'one-shot' container (removed after exit) from an image with shared directories for the results.
+# Note that directory sharing is not mandatory, one can just run the container without the -v options
+docker run -it --rm \
+-v [PATH_TO_ANALYSIS_RESULT]:/home/user/code/analysis \
+-v [PATH_TO_EXPORT_RESULT]:/home/user/code/export \
+[IMAGE_NAME]
+```
+
+### Container for platform modelling
+You can create a container that also share some source files describing your own platform [MY_PLATFORM]. Let us consider that the source files
+describing you platform are located in [PLATFORM_MODEL_PATH] and the interference specifications are located in
+[PLATFORM_INTERFERENCE_SPECIFICATION_PATH]. You can add these files as source code of the project by sharing them with the
+container as follows:
+```shell
+# In case the user wants to create its own platform [MY_PLATFORM],
+# Create share a folder to store the models [PATH_TO_MODEL]
+# Create share a folder to store the specification [PATH_TO_INTERFERENCE_SPECIFICATION]
+docker run -it --rm \
+-v [PATH_TO_MODEL]:/home/user/code/src/main/scala/pml/examples/[MY_PLATFORM] \
+-v [PATH_TO_INTERFERENCE_SPECIFICATION]:/home/user/code/src/main/scala/views/interference/examples/[MY_PLATFORM] \
+-v [PATH_TO_ANALYSIS_RESULT]:/home/user/code/analysis \
+-v [PATH_TO_EXPORT_RESULT]:/home/user/code/export \
+[IMAGE_NAME]
+```
+### Running PML Analyzer in Docker
+
+Once the container is run in an interactive mode, all the examples provided in the following sections can be run by using SBT.
+To display all the possible entry-points of the project, especially your models, just execute the following command
+```shell
+sbt run
+```
+Note that you can edit your code on the host and re-build it in the container by simply running again
+```shell
+sbt compile
+```
+
+You can also indicate the memory allocated to SBT using the `-J-XmxNG` option where N
+is the number of Go.
+```shell
+# Allocate 4Go to run SBT
+sbt -J-Xmx4G run
+```
+
+### Exchanging files between container and host
+
+The simplest way to retrieve files from the container or to modify internal files is to use the
+`docker cp` command.
+```shell
+# From the container to the host
+docker cp CONTAINER:SRC_PATH DEST_PATH
+
+# From the host to the container
+docker cp DEST_PATH CONTAINER:SRC_PATH
+```
+
+A more integrated sharing can be achieved thanks to docker volumes as shown in the previous sections.
+
+### Dealing with multiple images and containers
+Some useful commands for image and container management in Docker:
+```shell
+# to list all existing containers
+docker ps -a
+
+# to run an stopped container
+docker start [CONTAINER_NAME] -t
+
+# to remove a given container
+docker rm [CONTAINER_NAME]
+
+# remove all containers
+docker rm $(docker ps -a -q)
+
+# list images
+docker images
+
+# remove an image
+docker rmi [IMAGE NAME]
+```
+
+If you want to keep a container available after its creation please create the container as follows:
+```shell
+docker run -it -t [CONTAINER_NAME] [VOLUME_OPTIONS] [IMAGE_NAME]
+```
+
+You can then use it again by running
+```shell
+doker start -i [CONTAINER_NAME]
+```
\ No newline at end of file
diff --git a/doc/_docs/reference/gettingStarted/index.md b/doc/_docs/reference/gettingStarted/index.md
index e69de29..9cf9179 100644
--- a/doc/_docs/reference/gettingStarted/index.md
+++ b/doc/_docs/reference/gettingStarted/index.md
@@ -0,0 +1,5 @@
+---
+layout: index
+---
+
+TBD
diff --git a/doc/_docs/reference/usePML/editing_PML_model.md b/doc/_docs/reference/usePML/editing_PML_model.md
index e69de29..b24331d 100644
--- a/doc/_docs/reference/usePML/editing_PML_model.md
+++ b/doc/_docs/reference/usePML/editing_PML_model.md
@@ -0,0 +1,39 @@
+---
+layout: doc-page
+title: "Editing a PML Model"
+---
+
+The PML analyzer is based on a platform description provided in a Scala embedded Domain Specific Language
+called PML. Therefore, PML analyzer can be seen as an API to easily build your model and to carry out automatic analyses.
+
+Any IDE can be used to edit PML models, we can recommend [Intellij IDEA](https://www.jetbrains.com) that provides support plugins for Scala and SBT.
+
+Various benchmark systems for platform modeling are provided
+in the ``pml.examples`` package. These benchmarks can be used as a starting point to
+your modeling activity.
+
+#### Getting started with Intellij
+
+To edit PML model with Intellij please follow the installation steps given by [JetBrain](https://www.jetbrains.com).
+The installation can be made for any platform and does not require any administrator privilege.
+Once the Intellij is installed please download the Scala and SBT Executor plugins.
+
+#### Creating a project with Intellij
+
+The build specifications and project structure are provided with the PML source code.
+So to create a project you simply have to select "Open project" on the starting menu of Intellij and indicate the directory containing PML (where the file ``build.sbt`` is).
+
+The tool should then configure automatically your project.
+Please add all the library in ``lib`` as project libraries by right-clicking on them and select ``Add as library``
+
+The last step is to indicate the Java version of the project, to do so please go to ``File/Project Structure/Project/Project`` SDK and select ``Java 1.8``
+
+You are now able to build, run and debug your models with Intellij
+
+#### Troubleshooting
+
+**Connection error while loading project or running build** If your platform uses a proxy
+please indicate the connection credentials in ``File/Settings/Appearance & Behaviour/System Settings/HTTP Proxy``
+
+**No monosat library in path** If you want to use the integrated interference computation please indicate the path to the
+dynamic library of monosat by editing your run configuration and adding to VM options ``Djava.library.path=yourPath``
diff --git a/doc/_docs/reference/usePML/index.md b/doc/_docs/reference/usePML/index.md
index e69de29..d590a59 100644
--- a/doc/_docs/reference/usePML/index.md
+++ b/doc/_docs/reference/usePML/index.md
@@ -0,0 +1,22 @@
+---
+layout: index
+---
+
+There is no installation procedure for the PML analyzer itself, simply
+create your own model by importing the ``pml.model`` package containing the basic constructors
+of the PML language.
+
+The possible operation that can be performed on a PML model (such as linking
+or unlinking entities) are provided in the ``pml.operators`` package.
+
+Exporters to [yuml](https://yuml.me/diagram) and [graphviz](http://www.graphviz.org/) are provided in the ``pml.exporters`` package.
+
+The compilation of a PML model can be easily perform with [SBT](https://www.scala-sbt.org/)
++ First launch sbt in the project repository (this operation may take some time)
+```sbtshell
+ sbt
+```
++ Once sbt is ready to receive command launch the compilation and execution of your PML model
+```sbtshell
+ runMain pathToYourModel
+ ```
\ No newline at end of file
diff --git a/doc/_docs/reference/usePML/pml_examples.md b/doc/_docs/reference/usePML/pml_examples.md
index e69de29..981bbdc 100644
--- a/doc/_docs/reference/usePML/pml_examples.md
+++ b/doc/_docs/reference/usePML/pml_examples.md
@@ -0,0 +1,61 @@
+---
+layout: doc-page
+title: "Use PML by the examples"
+---
+
+#### Argumentation patterns
+
+The justification patterns considered for the CAST32-A are provided in the ``views.patterns`` package.
+These patterns can be used as a starting point to start your argumentation activity.
+
+To compile and run the PHYLOG patterns example please enter the following commands:
+```sbtshell
+ sbt runMain views.patterns.examples.PhylogPatterns
+```
+
+To compile and run the PHYLOG pattern instances example please enter the following commands:
+```sbtshell
+ sbt runMain views.patterns.examples.PhylogPatternsInstances
+```
+
+
+#### Modelling
+Various benchmark systems for platform modeling are provided
+in the ``pml.examples`` package. These benchmarks can be used as a starting point to
+your modeling activity.
+
+To compile and run the Keystone example please enter the following commands:
+```sbtshell
+ sbt runMain pml.examples.keystone.KeystoneExport
+```
+
+To compile and run the SimplePlatform example please enter the following commands:
+```sbtshell
+ sbt runMain pml.examples.simple.SimpleExport
+```
+
+Documentation is available [here](example/simpleKeystone/index.md)
+
+#### Analysis
+For each view (interference, patterns and dependability) examples are provided in the dedicated ``views.X.examples``.
+These benchmarks can be used as a starting point to
+your analysis activity. For instance, we can carry out the interference analysis of the Keystone platform with
+ ```sbtshell
+ # example of a PML model where an IDP interference model is generated
+ sbt runMain views.interference.examples.KeystoneExport
+
+ # example of a PML model where a Cecilia export is generated
+sbt runMain views.dependability.examples.KeystoneExport
+ ```
+
+If the tool is running on a Unix System you can use the Makefile to compile the DOT and LaTeX generated file:
+```shell
+# compile the DOT files
+make pml
+
+# compile the LaTeX Argumentation Patterns
+make patterns
+
+# transform PDF to PNG
+make png
+```
\ No newline at end of file
diff --git a/doc/_layouts/base.html b/doc/_layouts/base.html
index e69de29..3f25b8e 100644
--- a/doc/_layouts/base.html
+++ b/doc/_layouts/base.html
@@ -0,0 +1,5 @@
+
+
+
+
+{{ content }}
\ No newline at end of file
diff --git a/doc/_layouts/doc-page.html b/doc/_layouts/doc-page.html
index e69de29..ef102b7 100644
--- a/doc/_layouts/doc-page.html
+++ b/doc/_layouts/doc-page.html
@@ -0,0 +1,13 @@
+---
+layout: static-site-main
+---
+
+
+
+ {% if urls.editSource %}
+ Edit this page on GitHub
+ {% endif %}
+
{{ page.title }}
+
+ {{ content }}
+
\ No newline at end of file
diff --git a/doc/_layouts/index.html b/doc/_layouts/index.html
index e69de29..14f84bb 100644
--- a/doc/_layouts/index.html
+++ b/doc/_layouts/index.html
@@ -0,0 +1,24 @@
+---
+layout: static-site-main
+---
+
+
+
+ {% if urls.editSource %}
+
+ {% endif %}
+
+
+
\ No newline at end of file
diff --git a/doc/_layouts/main.html b/doc/_layouts/main.html
index e69de29..091d659 100644
--- a/doc/_layouts/main.html
+++ b/doc/_layouts/main.html
@@ -0,0 +1,5 @@
+---
+layout: base
+---
+
+
{{ content }}
\ No newline at end of file
diff --git a/doc/_layouts/static-site-main.html b/doc/_layouts/static-site-main.html
index e69de29..48b2484 100644
--- a/doc/_layouts/static-site-main.html
+++ b/doc/_layouts/static-site-main.html
@@ -0,0 +1,19 @@
+---
+layout: main
+---
+
+
\ No newline at end of file
diff --git a/doc/sidebar.yml b/doc/sidebar.yml
index e69de29..ebddb46 100644
--- a/doc/sidebar.yml
+++ b/doc/sidebar.yml
@@ -0,0 +1,32 @@
+index: index.md
+subsection:
+ - title: Getting started
+ index: doc/reference/gettingStarted/index.md
+ directory: reference/gettingStarted
+ subsection:
+ - page: reference/gettingStarted/getting_started_SBT.md
+ - page: reference/gettingStarted/getting_started_docker.md
+ - page: reference/gettingStarted/external_dependency.md
+ - title: Using PML
+ index: doc/reference/usePML/index.md
+ directory: reference/usePML
+ subsection:
+ - page: reference/usePML/editing_PML_model.md
+ - page: reference/usePML/pml_examples.md
+ - title: Examples
+ directory: example
+ subsection:
+ - title: Simple Keystone
+ index: doc/example/simpleKeystone/index.md
+ subsection:
+ - page: example/simpleKeystone/platform.md
+ - page: example/simpleKeystone/software.md
+ - page: example/simpleKeystone/routing.md
+ - page: example/simpleKeystone/library.md
+ - page: example/simpleKeystone/slicing.md
+ - page: example/simpleKeystone/specification.md
+ - page: example/simpleKeystone/export.md
+ - title: Simple T1042
+ page: example/simpleT1042/index.md
+
+
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 9fdd2f7..24d15ca 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,4 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
-addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.9.0")
\ No newline at end of file
+addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.9.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
diff --git a/src/main/scala/pml/examples/package.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/package.scala
similarity index 94%
rename from src/main/scala/pml/examples/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/package.scala
index 2d7f002..a3b4269 100644
--- a/src/main/scala/pml/examples/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml
+package onera.pmlanalyzer.pml
/**
* Package containing PML examples of simple platforms illustrating the basic modelling features of PML
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneExport.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneExport.scala
similarity index 89%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneExport.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneExport.scala
index 8c886ce..6d93f96 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneExport.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneExport.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,12 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
-import pml.exporters.*
-import pml.model.utils.Message
-import pml.operators.*
-import views.interference.examples.simpleKeystone.{SimpleKeystoneApplicativeTableBasedInterferenceSpecification, SimpleKeystonePhysicalTableBasedInterferenceSpecification}
+import onera.pmlanalyzer.pml.exporters.*
+import onera.pmlanalyzer.pml.model.utils.Message
+import onera.pmlanalyzer.pml.operators.*
+import onera.pmlanalyzer.views.interference.examples.simpleKeystone.{SimpleKeystoneApplicativeTableBasedInterferenceSpecification, SimpleKeystonePhysicalTableBasedInterferenceSpecification}
/**
* Program entry point to export several version of Keystone
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfiguration.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfiguration.scala
similarity index 94%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfiguration.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfiguration.scala
index 85cb63f..2b55521 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfiguration.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfiguration.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
/**
* Transaction that are always used.
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationFull.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationFull.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationFull.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationFull.scala
index c5e8794..458d4e6 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationFull.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationFull.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
/**
* All transaction are used
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationNoL1.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationNoL1.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationNoL1.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationNoL1.scala
index 0404c23..ed8c87b 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationNoL1.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationNoL1.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
/**
* Transactions used when the L1 is not used
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp21.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp21.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp21.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp21.scala
index ca95a49..ccd1e78 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp21.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp21.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
/**
* Transaction used when app4, app1 and app21 are scheduled
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp22.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp22.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp22.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp22.scala
index b984485..6acafc1 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp22.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneLibraryConfigurationPlanApp22.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
/**
* Transaction used when app22, app1 and app3 are scheduled
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystonePlatform.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystonePlatform.scala
similarity index 97%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleKeystonePlatform.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystonePlatform.scala
index 7edbf38..542f16a 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystonePlatform.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystonePlatform.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
-import pml.model.hardware._
-import pml.operators._
+import onera.pmlanalyzer.pml.model.hardware._
+import onera.pmlanalyzer.pml.operators._
import sourcecode.Name
/**
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneTransactionLibrary.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneTransactionLibrary.scala
similarity index 96%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneTransactionLibrary.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneTransactionLibrary.scala
index 791af55..6128f4f 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleKeystoneTransactionLibrary.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleKeystoneTransactionLibrary.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
-import pml.model.configuration.TransactionLibrary
-import pml.operators._
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.operators._
import scala.language.postfixOps
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleRoutingConfiguration.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleRoutingConfiguration.scala
similarity index 91%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleRoutingConfiguration.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleRoutingConfiguration.scala
index 4a4dd3b..f3cb57a 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleRoutingConfiguration.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleRoutingConfiguration.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
-import pml.operators._
+import onera.pmlanalyzer.pml.operators._
/**
* Routing constraints considered for simple Keystone
diff --git a/src/main/scala/pml/examples/simpleKeystone/SimpleSoftwareAllocation.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleSoftwareAllocation.scala
similarity index 96%
rename from src/main/scala/pml/examples/simpleKeystone/SimpleSoftwareAllocation.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleSoftwareAllocation.scala
index 58889a7..780ca76 100644
--- a/src/main/scala/pml/examples/simpleKeystone/SimpleSoftwareAllocation.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/SimpleSoftwareAllocation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleKeystone
+package onera.pmlanalyzer.pml.examples.simpleKeystone
-import pml.model.software.{Application, Data}
-import pml.operators._
+import onera.pmlanalyzer.pml.model.software.{Application, Data}
+import onera.pmlanalyzer.pml.operators._
import scala.language.postfixOps
diff --git a/src/main/scala/pml/examples/simpleKeystone/package.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/package.scala
similarity index 96%
rename from src/main/scala/pml/examples/simpleKeystone/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/package.scala
index 15d0597..5eda46f 100644
--- a/src/main/scala/pml/examples/simpleKeystone/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleKeystone/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples
+package onera.pmlanalyzer.pml.examples
/**
* Package containing an example on a simplification of a TI Keystone platform
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleRoutingConfiguration.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleRoutingConfiguration.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleT1042/SimpleRoutingConfiguration.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleRoutingConfiguration.scala
index eb90be6..c23e21b 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleRoutingConfiguration.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleRoutingConfiguration.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
trait SimpleRoutingConfiguration {
self: SimpleT1042Platform =>
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleSoftwareAllocation.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleSoftwareAllocation.scala
similarity index 94%
rename from src/main/scala/pml/examples/simpleT1042/SimpleSoftwareAllocation.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleSoftwareAllocation.scala
index d16935e..02a20b3 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleSoftwareAllocation.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleSoftwareAllocation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
-import pml.model.software.{Application, Data}
-import pml.operators._
+import onera.pmlanalyzer.pml.model.software.{Application, Data}
+import onera.pmlanalyzer.pml.operators._
import scala.language.postfixOps
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleT1042Export.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042Export.scala
similarity index 88%
rename from src/main/scala/pml/examples/simpleT1042/SimpleT1042Export.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042Export.scala
index 1645aee..3b7d521 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleT1042Export.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042Export.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
-import pml.exporters._
-import pml.operators._
-import views.interference.examples.simpleT1042.{SimpleT1042ApplicativeTableBasedInterferenceSpecification, SimpleT1042PhysicalTableBasedInterferenceSpecification}
+import onera.pmlanalyzer.pml.exporters._
+import onera.pmlanalyzer.pml.operators._
+import onera.pmlanalyzer.views.interference.examples.simpleT1042.{SimpleT1042ApplicativeTableBasedInterferenceSpecification, SimpleT1042PhysicalTableBasedInterferenceSpecification}
object SimpleT1042Export extends App {
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfiguration.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfiguration.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfiguration.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfiguration.scala
index 7d10b5d..ae7041b 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfiguration.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfiguration.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
trait SimpleT1042LibraryConfiguration extends SimpleT1042TransactionLibrary with SimpleSoftwareAllocation {
self: SimpleT1042Platform =>
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationFull.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationFull.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationFull.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationFull.scala
index bec1a05..61bed4a 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationFull.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationFull.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
trait SimpleT1042LibraryConfigurationFull extends SimpleT1042LibraryConfiguration {
self: SimpleT1042Platform =>
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationNoL1.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationNoL1.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationNoL1.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationNoL1.scala
index cc5399f..58ac283 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationNoL1.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationNoL1.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
trait SimpleT1042LibraryConfigurationNoL1 extends SimpleT1042LibraryConfiguration {
self: SimpleT1042Platform =>
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp21.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp21.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp21.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp21.scala
index 76ab4ec..15f901c 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp21.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp21.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
trait SimpleT1042LibraryConfigurationPlanApp21 extends SimpleT1042LibraryConfiguration {
self: SimpleT1042Platform =>
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp22.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp22.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp22.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp22.scala
index 72cdc21..0933107 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp22.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042LibraryConfigurationPlanApp22.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
trait SimpleT1042LibraryConfigurationPlanApp22 extends SimpleT1042LibraryConfiguration {
self: SimpleT1042Platform =>
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleT1042Platform.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042Platform.scala
similarity index 94%
rename from src/main/scala/pml/examples/simpleT1042/SimpleT1042Platform.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042Platform.scala
index 0552963..1c5bb29 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleT1042Platform.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042Platform.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
-import pml.model.hardware._
-import pml.operators._
+import onera.pmlanalyzer.pml.model.hardware._
+import onera.pmlanalyzer.pml.operators._
import sourcecode.Name
class SimpleT1042Platform(name: Symbol) extends Platform(name) {
diff --git a/src/main/scala/pml/examples/simpleT1042/SimpleT1042TransactionLibrary.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042TransactionLibrary.scala
similarity index 92%
rename from src/main/scala/pml/examples/simpleT1042/SimpleT1042TransactionLibrary.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042TransactionLibrary.scala
index 4fc61ea..d834cb3 100644
--- a/src/main/scala/pml/examples/simpleT1042/SimpleT1042TransactionLibrary.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/SimpleT1042TransactionLibrary.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples.simpleT1042
+package onera.pmlanalyzer.pml.examples.simpleT1042
-import pml.model.configuration.TransactionLibrary
-import pml.operators._
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.operators._
import scala.language.postfixOps
diff --git a/src/main/scala/pml/examples/simpleT1042/package.scala b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/package.scala
similarity index 93%
rename from src/main/scala/pml/examples/simpleT1042/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/package.scala
index 1df11eb..18c5b78 100644
--- a/src/main/scala/pml/examples/simpleT1042/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/examples/simpleT1042/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.examples
+package onera.pmlanalyzer.pml.examples
/**
* Package containing an example on a simplification of T1042 platform
diff --git a/src/main/scala/pml/exporters/FileManager.scala b/src/main/scala/onera/pmlanalyzer/pml/exporters/FileManager.scala
similarity index 97%
rename from src/main/scala/pml/exporters/FileManager.scala
rename to src/main/scala/onera/pmlanalyzer/pml/exporters/FileManager.scala
index e65b771..53ca240 100644
--- a/src/main/scala/pml/exporters/FileManager.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/exporters/FileManager.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.exporters
+package onera.pmlanalyzer.pml.exporters
import java.io.File
import scala.io.{BufferedSource, Source}
diff --git a/src/main/scala/pml/exporters/RelationExporter.scala b/src/main/scala/onera/pmlanalyzer/pml/exporters/RelationExporter.scala
similarity index 97%
rename from src/main/scala/pml/exporters/RelationExporter.scala
rename to src/main/scala/onera/pmlanalyzer/pml/exporters/RelationExporter.scala
index b4f3558..d97013f 100644
--- a/src/main/scala/pml/exporters/RelationExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/exporters/RelationExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,12 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.exporters
+package onera.pmlanalyzer.pml.exporters
-import pml.model.configuration.TransactionLibrary
-import pml.model.hardware.Platform
-import pml.model.software._
-import pml.operators._
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.hardware.Platform
+import onera.pmlanalyzer.pml.model.software._
+import onera.pmlanalyzer.pml.operators._
import java.io.FileWriter
diff --git a/src/main/scala/pml/exporters/UMLExporter.scala b/src/main/scala/onera/pmlanalyzer/pml/exporters/UMLExporter.scala
similarity index 98%
rename from src/main/scala/pml/exporters/UMLExporter.scala
rename to src/main/scala/onera/pmlanalyzer/pml/exporters/UMLExporter.scala
index 6a1a892..a5c5c0a 100644
--- a/src/main/scala/pml/exporters/UMLExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/exporters/UMLExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,12 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.exporters
+package onera.pmlanalyzer.pml.exporters
-import pml.model.hardware._
-import pml.model.service.{ArtificialService, Service}
-import pml.model.software.Application
-import pml.operators._
+import onera.pmlanalyzer.pml.model.hardware._
+import onera.pmlanalyzer.pml.model.service.{ArtificialService, Service}
+import onera.pmlanalyzer.pml.model.software.Application
+import onera.pmlanalyzer.pml.operators._
import java.io.{FileWriter, Writer}
import scala.collection.mutable.{HashMap => MHashMap}
diff --git a/src/main/scala/pml/exporters/package.scala b/src/main/scala/onera/pmlanalyzer/pml/exporters/package.scala
similarity index 92%
rename from src/main/scala/pml/exporters/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/exporters/package.scala
index a8dc0c0..fbc7a2e 100644
--- a/src/main/scala/pml/exporters/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/exporters/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml
+package onera.pmlanalyzer.pml
/**
* Package containing the extension methods to export PML model as tables or Graphviz.
*
* Must be imported as following to enable export extension
- * {{{import pml.exporters._}}}
+ * {{{import onera.pmlanalyzer.pml.exporters._}}}
*
* The available extension methods are provided in [[UMLExporter.Ops]] and [[RelationExporter.Ops]]
*
diff --git a/src/main/scala/pml/model/PMLNode.scala b/src/main/scala/onera/pmlanalyzer/pml/model/PMLNode.scala
similarity index 95%
rename from src/main/scala/pml/model/PMLNode.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/PMLNode.scala
index 00659fa..fc957b8 100644
--- a/src/main/scala/pml/model/PMLNode.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/PMLNode.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model
+package onera.pmlanalyzer.pml.model
import sourcecode.Enclosing
diff --git a/src/main/scala/pml/model/PMLNodeBuilder.scala b/src/main/scala/onera/pmlanalyzer/pml/model/PMLNodeBuilder.scala
similarity index 92%
rename from src/main/scala/pml/model/PMLNodeBuilder.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/PMLNodeBuilder.scala
index e5163d4..9e5d29c 100644
--- a/src/main/scala/pml/model/PMLNodeBuilder.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/PMLNodeBuilder.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model
+package onera.pmlanalyzer.pml.model
-import pml.model.hardware.Composite
-import pml.model.utils.Owner
+import onera.pmlanalyzer.pml.model.hardware.Composite
+import onera.pmlanalyzer.pml.model.utils.Owner
import scala.collection.mutable.{HashMap => MHashMap}
diff --git a/src/main/scala/pml/model/configuration/TransactionLibrary.scala b/src/main/scala/onera/pmlanalyzer/pml/model/configuration/TransactionLibrary.scala
similarity index 96%
rename from src/main/scala/pml/model/configuration/TransactionLibrary.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/configuration/TransactionLibrary.scala
index cc08a51..bb57d0e 100644
--- a/src/main/scala/pml/model/configuration/TransactionLibrary.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/configuration/TransactionLibrary.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,18 +15,18 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.configuration
+package onera.pmlanalyzer.pml.model.configuration
-import pml.model.configuration.TransactionLibrary.*
-import pml.model.hardware.Platform
-import pml.model.service.{Load, Service, Store}
-import pml.model.software.Application
-import pml.model.utils.{Message, Owner}
-import pml.model.{PMLNode, PMLNodeBuilder}
-import pml.operators.*
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary.*
+import onera.pmlanalyzer.pml.model.hardware.Platform
+import onera.pmlanalyzer.pml.model.service.{Load, Service, Store}
+import onera.pmlanalyzer.pml.model.software.Application
+import onera.pmlanalyzer.pml.model.utils.{Message, Owner}
+import onera.pmlanalyzer.pml.model.{PMLNode, PMLNodeBuilder}
+import onera.pmlanalyzer.pml.operators.*
import sourcecode.Name
-import views.interference.model.specification.InterferenceSpecification
-import views.interference.model.specification.InterferenceSpecification.{PhysicalTransaction, PhysicalTransactionId}
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.{PhysicalTransaction, PhysicalTransactionId}
import scala.reflect.ClassTag
/**
diff --git a/src/main/scala/pml/model/configuration/package.scala b/src/main/scala/onera/pmlanalyzer/pml/model/configuration/package.scala
similarity index 95%
rename from src/main/scala/pml/model/configuration/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/configuration/package.scala
index a646d0c..3731725 100644
--- a/src/main/scala/pml/model/configuration/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/configuration/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model
+package onera.pmlanalyzer.pml.model
/**
* Package containing configuration PML facet of a model
diff --git a/src/main/scala/pml/model/hardware/BaseHardwareNodeBuilder.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/BaseHardwareNodeBuilder.scala
similarity index 95%
rename from src/main/scala/pml/model/hardware/BaseHardwareNodeBuilder.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/BaseHardwareNodeBuilder.scala
index 12ccf54..2220d04 100644
--- a/src/main/scala/pml/model/hardware/BaseHardwareNodeBuilder.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/BaseHardwareNodeBuilder.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,12 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.hardware
+package onera.pmlanalyzer.pml.model.hardware
-import pml.model.PMLNodeBuilder
-import pml.model.relations.ProvideRelation
-import pml.model.service.{Load, Service, Store}
-import pml.model.utils.Owner
+import onera.pmlanalyzer.pml.model.PMLNodeBuilder
+import onera.pmlanalyzer.pml.model.relations.ProvideRelation
+import onera.pmlanalyzer.pml.model.service.{Load, Service, Store}
+import onera.pmlanalyzer.pml.model.utils.Owner
import sourcecode.Name
/**
diff --git a/src/main/scala/pml/model/hardware/Composite.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Composite.scala
similarity index 94%
rename from src/main/scala/pml/model/hardware/Composite.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/Composite.scala
index 4f0a4a7..fd4d828 100644
--- a/src/main/scala/pml/model/hardware/Composite.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Composite.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.hardware
+package onera.pmlanalyzer.pml.model.hardware
-import pml.model.PMLNodeBuilder
-import pml.model.hardware.Composite.formatName
-import pml.model.utils.Owner
+import onera.pmlanalyzer.pml.model.PMLNodeBuilder
+import onera.pmlanalyzer.pml.model.hardware.Composite.formatName
+import onera.pmlanalyzer.pml.model.utils.Owner
import sourcecode.Name
/**
diff --git a/src/main/scala/pml/model/hardware/Hardware.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Hardware.scala
similarity index 91%
rename from src/main/scala/pml/model/hardware/Hardware.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/Hardware.scala
index 60c94d0..74198c2 100644
--- a/src/main/scala/pml/model/hardware/Hardware.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Hardware.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.hardware
+package onera.pmlanalyzer.pml.model.hardware
-import pml.model.PMLNode
+import onera.pmlanalyzer.pml.model.PMLNode
import sourcecode.Enclosing
/**
diff --git a/src/main/scala/pml/model/hardware/Initiator.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Initiator.scala
similarity index 95%
rename from src/main/scala/pml/model/hardware/Initiator.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/Initiator.scala
index d8f4e6d..71f146e 100644
--- a/src/main/scala/pml/model/hardware/Initiator.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Initiator.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.hardware
+package onera.pmlanalyzer.pml.model.hardware
/**
* Class for the smart initiator, i.e. that can initiate transactions
diff --git a/src/main/scala/pml/model/hardware/Platform.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Platform.scala
similarity index 93%
rename from src/main/scala/pml/model/hardware/Platform.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/Platform.scala
index 6090785..f8d3d42 100644
--- a/src/main/scala/pml/model/hardware/Platform.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Platform.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,16 +15,16 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.hardware
+package onera.pmlanalyzer.pml.model.hardware
-import pml.model._
-import pml.model.relations.Relation
-import pml.model.service.{Load, Store}
-import pml.model.software.Application
-import pml.model.utils.Owner
-import pml.operators._
+import onera.pmlanalyzer.pml.model._
+import onera.pmlanalyzer.pml.model.relations.Relation
+import onera.pmlanalyzer.pml.model.service.{Load, Store}
+import onera.pmlanalyzer.pml.model.software.Application
+import onera.pmlanalyzer.pml.model.utils.Owner
+import onera.pmlanalyzer.pml.operators._
import sourcecode.File
-import views.interference.model.specification.InterferenceSpecification.{PhysicalScenario, PhysicalScenarioId, PhysicalTransaction, PhysicalTransactionId}
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.{PhysicalScenario, PhysicalScenarioId, PhysicalTransaction, PhysicalTransactionId}
import scala.collection.mutable.{HashMap => MHashMap}
import scala.language.implicitConversions
diff --git a/src/main/scala/pml/model/hardware/SimpleTransporter.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/SimpleTransporter.scala
similarity index 95%
rename from src/main/scala/pml/model/hardware/SimpleTransporter.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/SimpleTransporter.scala
index 567ad57..5aa1c67 100644
--- a/src/main/scala/pml/model/hardware/SimpleTransporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/SimpleTransporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.hardware
+package onera.pmlanalyzer.pml.model.hardware
/**
* Class modelling simple transporters.
diff --git a/src/main/scala/pml/model/hardware/Target.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Target.scala
similarity index 95%
rename from src/main/scala/pml/model/hardware/Target.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/Target.scala
index a5a4cc9..b1d84c6 100644
--- a/src/main/scala/pml/model/hardware/Target.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Target.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.hardware
+package onera.pmlanalyzer.pml.model.hardware
/**
* Class for all transaction destination
diff --git a/src/main/scala/pml/model/hardware/Transporter.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Transporter.scala
similarity index 95%
rename from src/main/scala/pml/model/hardware/Transporter.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/Transporter.scala
index 25b63aa..4609530 100644
--- a/src/main/scala/pml/model/hardware/Transporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Transporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.hardware
+package onera.pmlanalyzer.pml.model.hardware
import sourcecode.Enclosing
diff --git a/src/main/scala/pml/model/hardware/Virtualizer.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Virtualizer.scala
similarity index 95%
rename from src/main/scala/pml/model/hardware/Virtualizer.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/Virtualizer.scala
index c49c564..c76576a 100644
--- a/src/main/scala/pml/model/hardware/Virtualizer.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/Virtualizer.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.hardware
+package onera.pmlanalyzer.pml.model.hardware
/**
* A virtualizer is able to control the incoming transactions
diff --git a/src/main/scala/pml/model/hardware/package.scala b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/package.scala
similarity index 95%
rename from src/main/scala/pml/model/hardware/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/hardware/package.scala
index 42f5250..072bb53 100644
--- a/src/main/scala/pml/model/hardware/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/hardware/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model
+package onera.pmlanalyzer.pml.model
/**
* Package containing all hardware PML nodes
diff --git a/src/main/scala/pml/model/package.scala b/src/main/scala/onera/pmlanalyzer/pml/model/package.scala
similarity index 95%
rename from src/main/scala/pml/model/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/package.scala
index 50a6f4d..6028786 100644
--- a/src/main/scala/pml/model/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml
+package onera.pmlanalyzer.pml
/**
* Package containing PML nodes.
diff --git a/src/main/scala/pml/model/relations/AntiReflexiveSymmetricEndomorphism.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/AntiReflexiveSymmetricEndomorphism.scala
similarity index 91%
rename from src/main/scala/pml/model/relations/AntiReflexiveSymmetricEndomorphism.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/AntiReflexiveSymmetricEndomorphism.scala
index 78ecd6a..263fbf8 100644
--- a/src/main/scala/pml/model/relations/AntiReflexiveSymmetricEndomorphism.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/AntiReflexiveSymmetricEndomorphism.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.relations
+package onera.pmlanalyzer.pml.model.relations
-import pml.model.utils.Message
+import onera.pmlanalyzer.pml.model.utils.Message
import sourcecode.Name
abstract class AntiReflexiveSymmetricEndomorphism[A](iniValues: Map[A, Set[A]])(using n:Name) extends Endomorphism[A](iniValues) {
diff --git a/src/main/scala/pml/model/relations/AuthorizeRelation.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/AuthorizeRelation.scala
similarity index 89%
rename from src/main/scala/pml/model/relations/AuthorizeRelation.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/AuthorizeRelation.scala
index 482b952..3233ea4 100644
--- a/src/main/scala/pml/model/relations/AuthorizeRelation.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/AuthorizeRelation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.relations
+package onera.pmlanalyzer.pml.model.relations
-import pml.model.service.Service
-import pml.model.software.Application
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.model.software.Application
/**
* The relations used to encode authorized requests
diff --git a/src/main/scala/pml/model/relations/Endomorphism.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/Endomorphism.scala
similarity index 96%
rename from src/main/scala/pml/model/relations/Endomorphism.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/Endomorphism.scala
index e99ec8e..124b687 100644
--- a/src/main/scala/pml/model/relations/Endomorphism.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/Endomorphism.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.relations
+package onera.pmlanalyzer.pml.model.relations
import scalaz.Memo.immutableHashMapMemo
import sourcecode.Name
diff --git a/src/main/scala/pml/model/relations/LinkRelation.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/LinkRelation.scala
similarity index 90%
rename from src/main/scala/pml/model/relations/LinkRelation.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/LinkRelation.scala
index 7704a73..c99ece0 100644
--- a/src/main/scala/pml/model/relations/LinkRelation.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/LinkRelation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.relations
+package onera.pmlanalyzer.pml.model.relations
-import pml.model.hardware.Hardware
-import pml.model.service.Service
+import onera.pmlanalyzer.pml.model.hardware.Hardware
+import onera.pmlanalyzer.pml.model.service.Service
import sourcecode.Name
/**
diff --git a/src/main/scala/pml/model/relations/ProvideRelation.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/ProvideRelation.scala
similarity index 89%
rename from src/main/scala/pml/model/relations/ProvideRelation.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/ProvideRelation.scala
index 5679284..f91568b 100644
--- a/src/main/scala/pml/model/relations/ProvideRelation.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/ProvideRelation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.relations
+package onera.pmlanalyzer.pml.model.relations
-import pml.model.hardware.Hardware
-import pml.model.service.Service
+import onera.pmlanalyzer.pml.model.hardware.Hardware
+import onera.pmlanalyzer.pml.model.service.Service
import sourcecode.Name
/**
diff --git a/src/main/scala/pml/model/relations/ReflexiveSymmetricEndomorphism.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/ReflexiveSymmetricEndomorphism.scala
similarity index 91%
rename from src/main/scala/pml/model/relations/ReflexiveSymmetricEndomorphism.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/ReflexiveSymmetricEndomorphism.scala
index 4f5705d..4a2a528 100644
--- a/src/main/scala/pml/model/relations/ReflexiveSymmetricEndomorphism.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/ReflexiveSymmetricEndomorphism.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.relations
+package onera.pmlanalyzer.pml.model.relations
-import pml.model.utils.Message
+import onera.pmlanalyzer.pml.model.utils.Message
import sourcecode.Name
abstract class ReflexiveSymmetricEndomorphism[A](iniValues: Map[A, Set[A]])(using n:Name) extends Endomorphism[A](iniValues) {
diff --git a/src/main/scala/pml/model/relations/Relation.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/Relation.scala
similarity index 98%
rename from src/main/scala/pml/model/relations/Relation.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/Relation.scala
index 2d69567..30cb91e 100644
--- a/src/main/scala/pml/model/relations/Relation.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/Relation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.relations
+package onera.pmlanalyzer.pml.model.relations
import sourcecode.Name
diff --git a/src/main/scala/pml/model/relations/RoutingRelation.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/RoutingRelation.scala
similarity index 89%
rename from src/main/scala/pml/model/relations/RoutingRelation.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/RoutingRelation.scala
index 0b3e6ab..5b4e85d 100644
--- a/src/main/scala/pml/model/relations/RoutingRelation.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/RoutingRelation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.relations
+package onera.pmlanalyzer.pml.model.relations
-import pml.model.hardware.Initiator
-import pml.model.service.Service
+import onera.pmlanalyzer.pml.model.hardware.Initiator
+import onera.pmlanalyzer.pml.model.service.Service
import sourcecode.Name
/**
diff --git a/src/main/scala/pml/model/relations/UseRelation.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/UseRelation.scala
similarity index 89%
rename from src/main/scala/pml/model/relations/UseRelation.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/UseRelation.scala
index e6cf897..d521c79 100644
--- a/src/main/scala/pml/model/relations/UseRelation.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/UseRelation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.relations
+package onera.pmlanalyzer.pml.model.relations
-import pml.model.hardware.{Initiator, Target}
-import pml.model.service.Service
-import pml.model.software.{Application, Data}
+import onera.pmlanalyzer.pml.model.hardware.{Initiator, Target}
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.model.software.{Application, Data}
import sourcecode.Name
/**
diff --git a/src/main/scala/pml/model/relations/package.scala b/src/main/scala/onera/pmlanalyzer/pml/model/relations/package.scala
similarity index 94%
rename from src/main/scala/pml/model/relations/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/relations/package.scala
index 34600fa..d0cc7c1 100644
--- a/src/main/scala/pml/model/relations/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/relations/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model
+package onera.pmlanalyzer.pml.model
/**
* Package containing the implicit relations used to connect PML nodes
diff --git a/src/main/scala/pml/model/service/ArtificialService.scala b/src/main/scala/onera/pmlanalyzer/pml/model/service/ArtificialService.scala
similarity index 95%
rename from src/main/scala/pml/model/service/ArtificialService.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/service/ArtificialService.scala
index 34c6967..ce252eb 100644
--- a/src/main/scala/pml/model/service/ArtificialService.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/service/ArtificialService.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.service
+package onera.pmlanalyzer.pml.model.service
/**
* Base class for artificial services added to encode non topological affects
diff --git a/src/main/scala/pml/model/service/BaseServiceBuilder.scala b/src/main/scala/onera/pmlanalyzer/pml/model/service/BaseServiceBuilder.scala
similarity index 93%
rename from src/main/scala/pml/model/service/BaseServiceBuilder.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/service/BaseServiceBuilder.scala
index 049a6a6..75fb905 100644
--- a/src/main/scala/pml/model/service/BaseServiceBuilder.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/service/BaseServiceBuilder.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.service
+package onera.pmlanalyzer.pml.model.service
-import pml.model.PMLNodeBuilder
-import pml.model.utils.Owner
+import onera.pmlanalyzer.pml.model.PMLNodeBuilder
+import onera.pmlanalyzer.pml.model.utils.Owner
import sourcecode.Name
diff --git a/src/main/scala/pml/model/service/Load.scala b/src/main/scala/onera/pmlanalyzer/pml/model/service/Load.scala
similarity index 95%
rename from src/main/scala/pml/model/service/Load.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/service/Load.scala
index 3168f74..97cfe35 100644
--- a/src/main/scala/pml/model/service/Load.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/service/Load.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.service
+package onera.pmlanalyzer.pml.model.service
/**
* Base class for load services
diff --git a/src/main/scala/pml/model/service/Service.scala b/src/main/scala/onera/pmlanalyzer/pml/model/service/Service.scala
similarity index 91%
rename from src/main/scala/pml/model/service/Service.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/service/Service.scala
index 389b523..f8550fc 100644
--- a/src/main/scala/pml/model/service/Service.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/service/Service.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.service
+package onera.pmlanalyzer.pml.model.service
-import pml.model.PMLNode
+import onera.pmlanalyzer.pml.model.PMLNode
import sourcecode.Enclosing
/**
diff --git a/src/main/scala/pml/model/service/Store.scala b/src/main/scala/onera/pmlanalyzer/pml/model/service/Store.scala
similarity index 95%
rename from src/main/scala/pml/model/service/Store.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/service/Store.scala
index 3194eb7..2508d6e 100644
--- a/src/main/scala/pml/model/service/Store.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/service/Store.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.service
+package onera.pmlanalyzer.pml.model.service
/**
* Base class for store services
diff --git a/src/main/scala/pml/model/service/package.scala b/src/main/scala/onera/pmlanalyzer/pml/model/service/package.scala
similarity index 95%
rename from src/main/scala/pml/model/service/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/service/package.scala
index 6ec3f92..2b00255 100644
--- a/src/main/scala/pml/model/service/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/service/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model
+package onera.pmlanalyzer.pml.model
/**
* Package containing all service PML nodes
diff --git a/src/main/scala/pml/model/software/Application.scala b/src/main/scala/onera/pmlanalyzer/pml/model/software/Application.scala
similarity index 92%
rename from src/main/scala/pml/model/software/Application.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/software/Application.scala
index 1ae3724..1c667cf 100644
--- a/src/main/scala/pml/model/software/Application.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/software/Application.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.software
+package onera.pmlanalyzer.pml.model.software
-import pml.model.PMLNode
+import onera.pmlanalyzer.pml.model.PMLNode
/**
* Class for the application executed on initiators
diff --git a/src/main/scala/pml/model/software/BaseSoftwareNodeBuilder.scala b/src/main/scala/onera/pmlanalyzer/pml/model/software/BaseSoftwareNodeBuilder.scala
similarity index 93%
rename from src/main/scala/pml/model/software/BaseSoftwareNodeBuilder.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/software/BaseSoftwareNodeBuilder.scala
index 230736e..cb839ee 100644
--- a/src/main/scala/pml/model/software/BaseSoftwareNodeBuilder.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/software/BaseSoftwareNodeBuilder.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.software
+package onera.pmlanalyzer.pml.model.software
-import pml.model.PMLNodeBuilder
-import pml.model.utils.Owner
+import onera.pmlanalyzer.pml.model.PMLNodeBuilder
+import onera.pmlanalyzer.pml.model.utils.Owner
import sourcecode.Name
/**
diff --git a/src/main/scala/pml/model/software/Data.scala b/src/main/scala/onera/pmlanalyzer/pml/model/software/Data.scala
similarity index 91%
rename from src/main/scala/pml/model/software/Data.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/software/Data.scala
index 5ceaefd..c7a599a 100644
--- a/src/main/scala/pml/model/software/Data.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/software/Data.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.software
+package onera.pmlanalyzer.pml.model.software
-import pml.model.utils.Owner
-import pml.model.{PMLNode, PMLNodeBuilder}
+import onera.pmlanalyzer.pml.model.utils.Owner
+import onera.pmlanalyzer.pml.model.{PMLNode, PMLNodeBuilder}
import sourcecode.Name
/**
diff --git a/src/main/scala/pml/model/software/package.scala b/src/main/scala/onera/pmlanalyzer/pml/model/software/package.scala
similarity index 95%
rename from src/main/scala/pml/model/software/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/software/package.scala
index 20ee9e0..0d73326 100644
--- a/src/main/scala/pml/model/software/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/software/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model
+package onera.pmlanalyzer.pml.model
/**
* Package containing software PML nodes.
diff --git a/src/main/scala/pml/model/utils/Message.scala b/src/main/scala/onera/pmlanalyzer/pml/model/utils/Message.scala
similarity index 92%
rename from src/main/scala/pml/model/utils/Message.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/utils/Message.scala
index 5162c5f..0eba942 100644
--- a/src/main/scala/pml/model/utils/Message.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/utils/Message.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.utils
+package onera.pmlanalyzer.pml.model.utils
-import pml.model.configuration.TransactionLibrary.{UserScenarioId, UserTransactionId}
-import pml.model.hardware.{Hardware, Initiator, Target}
-import pml.model.service.Service
-import pml.model.software.Application
-import views.interference.model.specification.InterferenceSpecification.{PhysicalScenarioId, PhysicalTransaction, PhysicalTransactionId}
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary.{UserScenarioId, UserTransactionId}
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Initiator, Target}
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.model.software.Application
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.{PhysicalScenarioId, PhysicalTransaction, PhysicalTransactionId}
import scala.collection.mutable
diff --git a/src/main/scala/pml/model/utils/Owner.scala b/src/main/scala/onera/pmlanalyzer/pml/model/utils/Owner.scala
similarity index 93%
rename from src/main/scala/pml/model/utils/Owner.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/utils/Owner.scala
index fdc5c93..75081c7 100644
--- a/src/main/scala/pml/model/utils/Owner.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/utils/Owner.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model.utils
+package onera.pmlanalyzer.pml.model.utils
/**
* Utility class to track hierarchy in the model
diff --git a/src/main/scala/pml/model/utils/package.scala b/src/main/scala/onera/pmlanalyzer/pml/model/utils/package.scala
similarity index 93%
rename from src/main/scala/pml/model/utils/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/model/utils/package.scala
index 5f9b39d..4cef1f2 100644
--- a/src/main/scala/pml/model/utils/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/model/utils/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.model
+package onera.pmlanalyzer.pml.model
/**
* Package containing classes and methods
diff --git a/src/main/scala/pml/operators/AsTransaction.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/AsTransaction.scala
similarity index 89%
rename from src/main/scala/pml/operators/AsTransaction.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/AsTransaction.scala
index 91231fc..0c2746c 100644
--- a/src/main/scala/pml/operators/AsTransaction.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/AsTransaction.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.service.*
-import pml.operators.*
-import pml.model.software.Application
+import onera.pmlanalyzer.pml.model.service.*
+import onera.pmlanalyzer.pml.operators.*
+import onera.pmlanalyzer.pml.model.software.Application
import AsTransaction.TransactionParam
-import pml.model.hardware.Initiator
+import onera.pmlanalyzer.pml.model.hardware.Initiator
trait AsTransaction[A] {
def apply(a: => A): TransactionParam
diff --git a/src/main/scala/pml/operators/Deactivate.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/Deactivate.scala
similarity index 90%
rename from src/main/scala/pml/operators/Deactivate.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/Deactivate.scala
index c8e974d..6cf5254 100644
--- a/src/main/scala/pml/operators/Deactivate.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/Deactivate.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,12 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.hardware.{Hardware, Initiator}
-import pml.model.relations.{LinkRelation, ProvideRelation, UseRelation}
-import pml.model.service.Service
-import pml.model.software.Application
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Initiator}
+import onera.pmlanalyzer.pml.model.relations.{LinkRelation, ProvideRelation, UseRelation}
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.model.software.Application
/**
* Base trait for deactivation operations
diff --git a/src/main/scala/pml/operators/Link.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/Link.scala
similarity index 94%
rename from src/main/scala/pml/operators/Link.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/Link.scala
index bc9a801..05026fa 100644
--- a/src/main/scala/pml/operators/Link.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/Link.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.hardware.{Hardware, Initiator, Target, Transporter}
-import pml.model.relations.LinkRelation
-import pml.model.service.{Load, Service, Store}
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Initiator, Target, Transporter}
+import onera.pmlanalyzer.pml.model.relations.LinkRelation
+import onera.pmlanalyzer.pml.model.service.{Load, Service, Store}
import scala.reflect.{ClassTag, classTag}
diff --git a/src/main/scala/pml/operators/Linked.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/Linked.scala
similarity index 94%
rename from src/main/scala/pml/operators/Linked.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/Linked.scala
index 80bb05c..2c8466d 100644
--- a/src/main/scala/pml/operators/Linked.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/Linked.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.relations.LinkRelation
-import pml.model.service.{Load, Service, Store}
+import onera.pmlanalyzer.pml.model.relations.LinkRelation
+import onera.pmlanalyzer.pml.model.service.{Load, Service, Store}
import scala.reflect._
/**
* Base trait for linked operation
diff --git a/src/main/scala/pml/operators/Merge.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/Merge.scala
similarity index 98%
rename from src/main/scala/pml/operators/Merge.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/Merge.scala
index 6f20015..5dc7575 100644
--- a/src/main/scala/pml/operators/Merge.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/Merge.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.service.Service
+import onera.pmlanalyzer.pml.model.service.Service
/**
* Concatenation operation over two types
diff --git a/src/main/scala/pml/operators/Provided.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/Provided.scala
similarity index 91%
rename from src/main/scala/pml/operators/Provided.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/Provided.scala
index 74f3001..8e34ccc 100644
--- a/src/main/scala/pml/operators/Provided.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/Provided.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,15 +15,20 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.hardware._
-import pml.model.relations.ProvideRelation
-import pml.model.service.{Load, Service, Store}
-import pml.model.software.Data
-import pml.model.utils.Owner
+import onera.pmlanalyzer.pml.model.hardware.{Composite, Hardware, Initiator, Platform, SimpleTransporter, Target, Transporter, Virtualizer}
+import onera.pmlanalyzer.pml.model.relations.ProvideRelation
+import onera.pmlanalyzer.pml.model.service.{Load, Service, Store}
+import onera.pmlanalyzer.pml.model.software.Data
+import onera.pmlanalyzer.pml.model.utils.Owner
+import onera.pmlanalyzer.pml.model.hardware.*
+import onera.pmlanalyzer.pml.model.relations.ProvideRelation
+import onera.pmlanalyzer.pml.model.service.{Load, Service, Store}
+import onera.pmlanalyzer.pml.model.software.Data
+import onera.pmlanalyzer.pml.model.utils.Owner
-import scala.reflect._
+import scala.reflect.*
/**
* Base trait for provide operator
@@ -49,7 +54,7 @@ object Provided {
/**
* If an element l of type L can provide element of type R then the operator can be used
*
- * To access to the load services provided by an element l (e.g. a [[pml.model.hardware.Hardware]])
+ * To access to the load services provided by an element l (e.g. a [[Hardware]])
* {{{ l.loads }}}
* To access to the store services provided by an element l
* {{{ l.stores }}}
@@ -63,7 +68,7 @@ object Provided {
* {{{ l.transporters }}}
* To access to the hardware provided by an element l
* {{{ l.hardware }}}
- * To access to the initiator providing an element l (e.g. a [[pml.model.service.Service]])
+ * To access to the initiator providing an element l (e.g. a [[Service]])
* {{{ l.initiatorOwner }}}
* To access to the target providing an element l
* {{{ l.targetOwner }}}
@@ -73,7 +78,8 @@ object Provided {
* {{{ l.hardwareOwner }}}
* To check if an hardware r is providing an element l
* {{{ l.hardwareOwnerIs(r) }}}
- * @note currently provide operators are maily applicable on [[pml.model.hardware.Hardware]] and [[pml.model.software.Data]]
+ *
+ * @note currently provide operators are maily applicable on [[Hardware]] and [[pml.model.software.Data]]
* @see provide usage can be found in [[views.interference.examples.simpleKeystone.SimpleKeystonePhysicalTableBasedInterferenceSpecification]]
*/
trait Ops {
diff --git a/src/main/scala/pml/operators/Restrict.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/Restrict.scala
similarity index 97%
rename from src/main/scala/pml/operators/Restrict.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/Restrict.scala
index 3043539..c06e83d 100644
--- a/src/main/scala/pml/operators/Restrict.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/Restrict.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.hardware.{Hardware, Initiator, Platform}
-import pml.model.relations.{AuthorizeRelation, LinkRelation, RoutingRelation, UseRelation}
-import pml.model.service.{Load, Service, Store}
-import pml.model.software.Application
-import pml.model.utils.Message
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Initiator, Platform}
+import onera.pmlanalyzer.pml.model.relations.{AuthorizeRelation, LinkRelation, RoutingRelation, UseRelation}
+import onera.pmlanalyzer.pml.model.service.{Load, Service, Store}
+import onera.pmlanalyzer.pml.model.software.Application
+import onera.pmlanalyzer.pml.model.utils.Message
import scala.collection.mutable.HashMap as MHashMap
diff --git a/src/main/scala/pml/operators/Route.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/Route.scala
similarity index 95%
rename from src/main/scala/pml/operators/Route.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/Route.scala
index 724cf0e..534fb2e 100644
--- a/src/main/scala/pml/operators/Route.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/Route.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.hardware._
-import pml.model.relations.RoutingRelation
-import pml.model.service._
-import pml.model.utils.Message.uselessRoutingConstraintWarning
-import pml.model.utils.Owner
+import onera.pmlanalyzer.pml.model.hardware._
+import onera.pmlanalyzer.pml.model.relations.RoutingRelation
+import onera.pmlanalyzer.pml.model.service._
+import onera.pmlanalyzer.pml.model.utils.Message.uselessRoutingConstraintWarning
+import onera.pmlanalyzer.pml.model.utils.Owner
/**
diff --git a/src/main/scala/pml/operators/Use.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/Use.scala
similarity index 94%
rename from src/main/scala/pml/operators/Use.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/Use.scala
index be427eb..6e88854 100644
--- a/src/main/scala/pml/operators/Use.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/Use.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,12 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.hardware.{Initiator, Target}
-import pml.model.relations.{AuthorizeRelation, UseRelation}
-import pml.model.service.{Load, Service, Store}
-import pml.model.software.{Application, Data}
+import onera.pmlanalyzer.pml.model.hardware.{Initiator, Target}
+import onera.pmlanalyzer.pml.model.relations.{AuthorizeRelation, UseRelation}
+import onera.pmlanalyzer.pml.model.service.{Load, Service, Store}
+import onera.pmlanalyzer.pml.model.software.{Application, Data}
/**
* Base trait for use operator
diff --git a/src/main/scala/pml/operators/Used.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/Used.scala
similarity index 95%
rename from src/main/scala/pml/operators/Used.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/Used.scala
index 4b1fe04..fe7fd89 100644
--- a/src/main/scala/pml/operators/Used.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/Used.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,16 +15,16 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml.operators
+package onera.pmlanalyzer.pml.operators
-import pml.model.hardware.{Initiator, Platform, Target}
-import pml.model.relations.UseRelation
-import pml.model.service.{Load, Service, Store}
-import pml.model.software.{Application, Data}
-import pml.model.utils.Message._
+import onera.pmlanalyzer.pml.model.hardware.{Initiator, Platform, Target}
+import onera.pmlanalyzer.pml.model.relations.UseRelation
+import onera.pmlanalyzer.pml.model.service.{Load, Service, Store}
+import onera.pmlanalyzer.pml.model.software.{Application, Data}
+import onera.pmlanalyzer.pml.model.utils.Message._
import scalaz.Memo.immutableHashMapMemo
-import views.interference.model.specification.InterferenceSpecification.{Path, PhysicalTransaction}
-import pml.operators._
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.{Path, PhysicalTransaction}
+import onera.pmlanalyzer.pml.operators._
import scala.reflect._
/**
diff --git a/src/main/scala/pml/operators/package.scala b/src/main/scala/onera/pmlanalyzer/pml/operators/package.scala
similarity index 94%
rename from src/main/scala/pml/operators/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/operators/package.scala
index 29ef36f..45c1601 100644
--- a/src/main/scala/pml/operators/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/operators/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,14 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package pml
+package onera.pmlanalyzer.pml
+
/**
* Package containing all the extension methods provided by operators
*
* @note This package should be imported in all pml models as so
* {{{
- * import pml.operators._
+ * import onera.pmlanalyzer.pml.operators._
* }}}
* @see [[Link.Ops]] for link (e.g. link/unlink) keywords
* @see [[Linked.Ops]] for linked (e.g. linked/reverse) keywords
diff --git a/src/main/scala/pml/package.scala b/src/main/scala/onera/pmlanalyzer/pml/package.scala
similarity index 81%
rename from src/main/scala/pml/package.scala
rename to src/main/scala/onera/pmlanalyzer/pml/package.scala
index ec1b88f..ffbf2f7 100644
--- a/src/main/scala/pml/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/pml/package.scala
@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer
/*******************************************************************************
* Copyright (c) 2021. ONERA
diff --git a/src/main/scala/views/dependability/executor/Scheduler.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/executor/Scheduler.scala
similarity index 85%
rename from src/main/scala/views/dependability/executor/Scheduler.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/executor/Scheduler.scala
index 3970806..cab4b87 100644
--- a/src/main/scala/views/dependability/executor/Scheduler.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/executor/Scheduler.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.executor
+package onera.pmlanalyzer.views.dependability.executor
-import views.dependability.model.ConcreteEvent
-import views.dependability.model.Direction.{Degradation, Reparation}
+import onera.pmlanalyzer.views.dependability.model.ConcreteEvent
+import onera.pmlanalyzer.views.dependability.model.Direction.{Degradation, Reparation}
trait Scheduler {
def schedule(fireable:Iterable[ConcreteEvent]):Iterable[ConcreteEvent]
diff --git a/src/main/scala/views/dependability/executor/Simulator.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/executor/Simulator.scala
similarity index 95%
rename from src/main/scala/views/dependability/executor/Simulator.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/executor/Simulator.scala
index fbb1d2f..c9266af 100644
--- a/src/main/scala/views/dependability/executor/Simulator.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/executor/Simulator.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.executor
+package onera.pmlanalyzer.views.dependability.executor
-import views.dependability.model._
+import onera.pmlanalyzer.views.dependability.model._
import scala.collection.mutable
diff --git a/src/main/scala/views/dependability/executor/Synchronize.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/executor/Synchronize.scala
similarity index 94%
rename from src/main/scala/views/dependability/executor/Synchronize.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/executor/Synchronize.scala
index 030f829..94d9c01 100644
--- a/src/main/scala/views/dependability/executor/Synchronize.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/executor/Synchronize.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.executor
+package onera.pmlanalyzer.views.dependability.executor
-import views.dependability.model.{ConcreteEvent, Event, SynchroEvent}
+import onera.pmlanalyzer.views.dependability.model.{ConcreteEvent, Event, SynchroEvent}
import scala.collection.mutable
diff --git a/src/main/scala/views/dependability/exporters/AutomatonCeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/AutomatonCeciliaExporter.scala
similarity index 91%
rename from src/main/scala/views/dependability/exporters/AutomatonCeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/AutomatonCeciliaExporter.scala
index 5cde181..cd3b6fa 100644
--- a/src/main/scala/views/dependability/exporters/AutomatonCeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/AutomatonCeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.exporters.CeciliaExporter.Aux
-import views.dependability.exporters.GenericImage._
-import views.dependability.exporters.PhylogFolder.automatonFamilyFolder
-import views.dependability.model.{Direction, Fire, InputFMAutomaton, SimpleFMAutomaton}
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.exporters.CeciliaExporter.Aux
+import onera.pmlanalyzer.views.dependability.exporters.GenericImage._
+import onera.pmlanalyzer.views.dependability.exporters.PhylogFolder.automatonFamilyFolder
+import onera.pmlanalyzer.views.dependability.model.{Direction, Fire, InputFMAutomaton, SimpleFMAutomaton}
+import onera.pmlanalyzer.views.dependability.operators._
trait AutomatonCeciliaExporter {
self: TypeCeciliaExporter =>
diff --git a/src/main/scala/views/dependability/exporters/BasicOperationCeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/BasicOperationCeciliaExporter.scala
similarity index 97%
rename from src/main/scala/views/dependability/exporters/BasicOperationCeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/BasicOperationCeciliaExporter.scala
index c431f4b..798d8c1 100644
--- a/src/main/scala/views/dependability/exporters/BasicOperationCeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/BasicOperationCeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.model.{Component, Direction, Fire, Variable, VariableId, System => DepSystem}
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.operators.{IsCriticityOrdering, IsFinite, IsShadowOrdering}
+import onera.pmlanalyzer.views.dependability.model.{Component, Direction, Fire, Variable, VariableId, System as DepSystem}
+import onera.pmlanalyzer.views.dependability.operators.*
trait BasicOperationCeciliaExporter {
self:TypeCeciliaExporter =>
diff --git a/src/main/scala/views/dependability/exporters/CeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/CeciliaExporter.scala
similarity index 93%
rename from src/main/scala/views/dependability/exporters/CeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/CeciliaExporter.scala
index 427123c..f07128b 100644
--- a/src/main/scala/views/dependability/exporters/CeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/CeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import pml.exporters.FileManager
+import onera.pmlanalyzer.pml.exporters.FileManager
import scala.xml.{Elem, XML}
diff --git a/src/main/scala/views/dependability/exporters/ExprCeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/ExprCeciliaExporter.scala
similarity index 94%
rename from src/main/scala/views/dependability/exporters/ExprCeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/ExprCeciliaExporter.scala
index 687609c..77b46d3 100644
--- a/src/main/scala/views/dependability/exporters/ExprCeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/ExprCeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.exporters.CeciliaExporter.Aux
-import views.dependability.model._
-import views.dependability.operators.allOf
+import onera.pmlanalyzer.views.dependability.exporters.CeciliaExporter.Aux
+import onera.pmlanalyzer.views.dependability.model._
+import onera.pmlanalyzer.views.dependability.operators.allOf
trait ExprCeciliaExporter {
self:BasicOperationCeciliaExporter with TypeCeciliaExporter =>
diff --git a/src/main/scala/views/dependability/exporters/Folder.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/Folder.scala
similarity index 96%
rename from src/main/scala/views/dependability/exporters/Folder.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/Folder.scala
index d8105f7..a0528ad 100644
--- a/src/main/scala/views/dependability/exporters/Folder.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/Folder.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.exporters.Folder.date
-import views.dependability.exporters.Model._
+import onera.pmlanalyzer.views.dependability.exporters.Folder.date
+import onera.pmlanalyzer.views.dependability.exporters.Model._
import java.lang.{System => OS}
import scala.xml.Elem
diff --git a/src/main/scala/views/dependability/exporters/GenericImage.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/GenericImage.scala
similarity index 96%
rename from src/main/scala/views/dependability/exporters/GenericImage.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/GenericImage.scala
index 3f65757..07cc2f0 100644
--- a/src/main/scala/views/dependability/exporters/GenericImage.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/GenericImage.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.exporters.PhylogFolder._
+import onera.pmlanalyzer.views.dependability.exporters.PhylogFolder._
object GenericImage {
diff --git a/src/main/scala/views/dependability/exporters/Model.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/Model.scala
similarity index 98%
rename from src/main/scala/views/dependability/exporters/Model.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/Model.scala
index 9d87e7a..54e695f 100644
--- a/src/main/scala/views/dependability/exporters/Model.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/Model.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.exporters.Model.{ComponentDescriptor, EnumeratedTypeDescriptor, EquipmentDescriptor, ImgDescriptor, ModelDescriptor}
+import onera.pmlanalyzer.views.dependability.exporters.Model.{ComponentDescriptor, EnumeratedTypeDescriptor, EquipmentDescriptor, ImgDescriptor, ModelDescriptor}
import java.awt.image.BufferedImage
import java.io.{ByteArrayInputStream, File, InputStream}
diff --git a/src/main/scala/views/dependability/exporters/PhylogFolder.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/PhylogFolder.scala
similarity index 97%
rename from src/main/scala/views/dependability/exporters/PhylogFolder.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/PhylogFolder.scala
index 555cc6f..464dc84 100644
--- a/src/main/scala/views/dependability/exporters/PhylogFolder.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/PhylogFolder.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
object PhylogFolder {
val genericImageFolder: FamilyFolder[ImageModel] = FamilyFolder(Symbol("generic"))
diff --git a/src/main/scala/views/dependability/exporters/PlatformCeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/PlatformCeciliaExporter.scala
similarity index 88%
rename from src/main/scala/views/dependability/exporters/PlatformCeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/PlatformCeciliaExporter.scala
index e10faa2..796c14c 100644
--- a/src/main/scala/views/dependability/exporters/PlatformCeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/PlatformCeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,17 +15,17 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
-
-import pml.exporters.FileManager
-import pml.model.hardware.{Hardware, Platform, Virtualizer, Initiator as PMLInitiator, SimpleTransporter as PMLSimpleTransporter, Target as PMLTarget, Transporter as PMLTransporter}
-import pml.model.service.Service
-import pml.model.software.Application as PMLApplication
-import pml.operators.*
-import views.dependability.exporters.CeciliaExporter.Aux
-import views.dependability.model.CustomTypes.TargetStatus
-import views.dependability.model.{Expr, InitiatorId, InputDepTarget, InputInDepTarget, Software, SoftwareId, TargetId, TransporterId, Variable, Application as DepApplication, BasicTransporter as DepBasicTransporter, Initiator as DepInitiator, SimpleTransporter as DepSimpleTransporter, System as DepSystem, Virtualizer as DepVirtualizer}
-import views.dependability.operators.{IsCriticityOrdering, IsFinite, IsShadowOrdering}
+package onera.pmlanalyzer.views.dependability.exporters
+
+import onera.pmlanalyzer.pml.exporters.FileManager
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Platform, Virtualizer, Initiator as PMLInitiator, SimpleTransporter as PMLSimpleTransporter, Target as PMLTarget, Transporter as PMLTransporter}
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.model.software.Application as PMLApplication
+import onera.pmlanalyzer.pml.operators.*
+import onera.pmlanalyzer.views.dependability.exporters.CeciliaExporter.Aux
+import onera.pmlanalyzer.views.dependability.model.CustomTypes.TargetStatus
+import onera.pmlanalyzer.views.dependability.model.{Expr, InitiatorId, InputDepTarget, InputInDepTarget, Software, SoftwareId, TargetId, TransporterId, Variable, Application as DepApplication, BasicTransporter as DepBasicTransporter, Initiator as DepInitiator, SimpleTransporter as DepSimpleTransporter, System as DepSystem, Virtualizer as DepVirtualizer}
+import onera.pmlanalyzer.views.dependability.operators.{IsCriticityOrdering, IsFinite, IsShadowOrdering}
import scala.reflect._
import scala.xml.XML
diff --git a/src/main/scala/views/dependability/exporters/SoftwareCeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/SoftwareCeciliaExporter.scala
similarity index 90%
rename from src/main/scala/views/dependability/exporters/SoftwareCeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/SoftwareCeciliaExporter.scala
index 879a496..20bbd17 100644
--- a/src/main/scala/views/dependability/exporters/SoftwareCeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/SoftwareCeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.exporters.CeciliaExporter.Aux
-import views.dependability.exporters.GenericImage._
-import views.dependability.exporters.PhylogFolder.phylogInitiatorFolder
-import views.dependability.model.{Application, Descriptor, TargetId}
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.exporters.CeciliaExporter.Aux
+import onera.pmlanalyzer.views.dependability.exporters.GenericImage._
+import onera.pmlanalyzer.views.dependability.exporters.PhylogFolder.phylogInitiatorFolder
+import onera.pmlanalyzer.views.dependability.model.{Application, Descriptor, TargetId}
+import onera.pmlanalyzer.views.dependability.operators._
trait SoftwareCeciliaExporter {
self: TypeCeciliaExporter with BasicOperationCeciliaExporter with ExprCeciliaExporter=>
diff --git a/src/main/scala/views/dependability/exporters/SystemCeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/SystemCeciliaExporter.scala
similarity index 92%
rename from src/main/scala/views/dependability/exporters/SystemCeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/SystemCeciliaExporter.scala
index 4dbea0f..41fc6a2 100644
--- a/src/main/scala/views/dependability/exporters/SystemCeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/SystemCeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.exporters.CeciliaExporter.Aux
-import views.dependability.model.{InputDepTarget, System, Variable}
+import onera.pmlanalyzer.views.dependability.exporters.CeciliaExporter.Aux
+import onera.pmlanalyzer.views.dependability.model.{InputDepTarget, System, Variable}
trait SystemCeciliaExporter {
self: BasicOperationCeciliaExporter & TypeCeciliaExporter =>
diff --git a/src/main/scala/views/dependability/exporters/TargetCeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/TargetCeciliaExporter.scala
similarity index 93%
rename from src/main/scala/views/dependability/exporters/TargetCeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/TargetCeciliaExporter.scala
index fdedee1..0fd402c 100644
--- a/src/main/scala/views/dependability/exporters/TargetCeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/TargetCeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.exporters.CeciliaExporter.Aux
-import views.dependability.exporters.GenericImage._
-import views.dependability.exporters.PhylogFolder.phylogTargetFolder
-import views.dependability.model._
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.exporters.CeciliaExporter.Aux
+import onera.pmlanalyzer.views.dependability.exporters.GenericImage._
+import onera.pmlanalyzer.views.dependability.exporters.PhylogFolder.phylogTargetFolder
+import onera.pmlanalyzer.views.dependability.model._
+import onera.pmlanalyzer.views.dependability.operators._
trait TargetCeciliaExporter {
self:TypeCeciliaExporter with AutomatonCeciliaExporter with BasicOperationCeciliaExporter =>
diff --git a/src/main/scala/views/dependability/exporters/TransporterCeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/TransporterCeciliaExporter.scala
similarity index 97%
rename from src/main/scala/views/dependability/exporters/TransporterCeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/TransporterCeciliaExporter.scala
index a6ced2a..88062c2 100644
--- a/src/main/scala/views/dependability/exporters/TransporterCeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/TransporterCeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.exporters.CeciliaExporter.Aux
-import views.dependability.exporters.GenericImage._
-import views.dependability.exporters.PhylogFolder.phylogTransporterFolder
-import views.dependability.model._
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.exporters.CeciliaExporter.Aux
+import onera.pmlanalyzer.views.dependability.exporters.GenericImage._
+import onera.pmlanalyzer.views.dependability.exporters.PhylogFolder.phylogTransporterFolder
+import onera.pmlanalyzer.views.dependability.model._
+import onera.pmlanalyzer.views.dependability.operators._
trait TransporterCeciliaExporter {
self:TypeCeciliaExporter with AutomatonCeciliaExporter with BasicOperationCeciliaExporter =>
diff --git a/src/main/scala/views/dependability/exporters/TypeCeciliaExporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/TypeCeciliaExporter.scala
similarity index 91%
rename from src/main/scala/views/dependability/exporters/TypeCeciliaExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/TypeCeciliaExporter.scala
index acf3638..2f599fb 100644
--- a/src/main/scala/views/dependability/exporters/TypeCeciliaExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/TypeCeciliaExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.exporters
+package onera.pmlanalyzer.views.dependability.exporters
-import views.dependability.operators.{IsFinite, _}
+import onera.pmlanalyzer.views.dependability.operators.{IsFinite, _}
trait TypeCeciliaExporter {
def typeModel[T: IsFinite]: EnumeratedType = {
diff --git a/src/main/scala/views/dependability/exporters/package.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/package.scala
similarity index 94%
rename from src/main/scala/views/dependability/exporters/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/exporters/package.scala
index a2d1779..e6c729d 100644
--- a/src/main/scala/views/dependability/exporters/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/exporters/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability
+package onera.pmlanalyzer.views.dependability
package object exporters extends TypeCeciliaExporter
with BasicOperationCeciliaExporter
diff --git a/src/main/scala/views/dependability/model/Component.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Component.scala
similarity index 92%
rename from src/main/scala/views/dependability/model/Component.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Component.scala
index 1e0c317..aaec6e2 100644
--- a/src/main/scala/views/dependability/model/Component.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Component.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
trait Component {
val id:Id
diff --git a/src/main/scala/views/dependability/model/Copy.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Copy.scala
similarity index 92%
rename from src/main/scala/views/dependability/model/Copy.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Copy.scala
index 7867d9a..93202f4 100644
--- a/src/main/scala/views/dependability/model/Copy.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Copy.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,6 +15,6 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
case class Copy(targetNeeded:Set[TargetId], targetWritten:Set[TargetId])
diff --git a/src/main/scala/views/dependability/model/CustomTypes.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/CustomTypes.scala
similarity index 91%
rename from src/main/scala/views/dependability/model/CustomTypes.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/CustomTypes.scala
index c57ca31..0f15c7e 100644
--- a/src/main/scala/views/dependability/model/CustomTypes.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/CustomTypes.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.operators._
object CustomTypes {
diff --git a/src/main/scala/views/dependability/model/Direction.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Direction.scala
similarity index 89%
rename from src/main/scala/views/dependability/model/Direction.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Direction.scala
index 7c6ecc8..d4c55cf 100644
--- a/src/main/scala/views/dependability/model/Direction.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Direction.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.operators.{IsCriticityOrdering, IsFinite}
+import onera.pmlanalyzer.views.dependability.operators.{IsCriticityOrdering, IsFinite}
object Direction extends Enumeration {
diff --git a/src/main/scala/views/dependability/model/EnumFailureMode.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/EnumFailureMode.scala
similarity index 90%
rename from src/main/scala/views/dependability/model/EnumFailureMode.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/EnumFailureMode.scala
index d23fb48..90a5a18 100644
--- a/src/main/scala/views/dependability/model/EnumFailureMode.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/EnumFailureMode.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.operators.{IsCriticityOrdering, IsFinite, IsShadowOrdering}
+import onera.pmlanalyzer.views.dependability.operators.{IsCriticityOrdering, IsFinite, IsShadowOrdering}
trait EnumFailureMode extends Enumeration {
self =>
diff --git a/src/main/scala/views/dependability/model/Event.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Event.scala
similarity index 92%
rename from src/main/scala/views/dependability/model/Event.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Event.scala
index 7a4d81f..eb92cb5 100644
--- a/src/main/scala/views/dependability/model/Event.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Event.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.executor.Simulator
+import onera.pmlanalyzer.views.dependability.executor.Simulator
trait Event {
val name:Symbol
diff --git a/src/main/scala/views/dependability/model/Fire.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Fire.scala
similarity index 89%
rename from src/main/scala/views/dependability/model/Fire.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Fire.scala
index 208ea37..b4f8cdb 100644
--- a/src/main/scala/views/dependability/model/Fire.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Fire.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.operators.IsFinite
+import onera.pmlanalyzer.views.dependability.operators.IsFinite
object Fire extends Enumeration {
diff --git a/src/main/scala/views/dependability/model/Id.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Id.scala
similarity index 95%
rename from src/main/scala/views/dependability/model/Id.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Id.scala
index 7d37eed..89392ea 100644
--- a/src/main/scala/views/dependability/model/Id.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Id.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.operators.IsFinite
+import onera.pmlanalyzer.views.dependability.operators.IsFinite
import scala.collection.mutable
diff --git a/src/main/scala/views/dependability/model/ModeAutomaton.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/ModeAutomaton.scala
similarity index 95%
rename from src/main/scala/views/dependability/model/ModeAutomaton.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/ModeAutomaton.scala
index a07e07a..bc80203 100644
--- a/src/main/scala/views/dependability/model/ModeAutomaton.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/ModeAutomaton.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.model.Direction.{Constant, Degradation, Reparation}
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.model.Direction.{Constant, Degradation, Reparation}
+import onera.pmlanalyzer.views.dependability.operators._
/**
* Base trait for all automaton-like component
diff --git a/src/main/scala/views/dependability/model/Software.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Software.scala
similarity index 93%
rename from src/main/scala/views/dependability/model/Software.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Software.scala
index 6db1106..b2dff11 100644
--- a/src/main/scala/views/dependability/model/Software.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Software.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.exporters._
-import views.dependability.model.CustomTypes.TargetStatus
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.exporters._
+import onera.pmlanalyzer.views.dependability.model.CustomTypes.TargetStatus
+import onera.pmlanalyzer.views.dependability.operators._
trait Software[FM] extends Component {
diff --git a/src/main/scala/views/dependability/model/System.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/System.scala
similarity index 92%
rename from src/main/scala/views/dependability/model/System.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/System.scala
index 8a1b084..de6102c 100644
--- a/src/main/scala/views/dependability/model/System.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/System.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.exporters.SubComponent
+import onera.pmlanalyzer.views.dependability.exporters.SubComponent
import scala.collection.mutable
diff --git a/src/main/scala/views/dependability/model/Target.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Target.scala
similarity index 86%
rename from src/main/scala/views/dependability/model/Target.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Target.scala
index bc546f2..c84e410 100644
--- a/src/main/scala/views/dependability/model/Target.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Target.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.exporters.{SubComponent, _}
-import views.dependability.model.CustomTypes.Request
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.exporters.SubComponent
+import onera.pmlanalyzer.views.dependability.operators.{IsCriticityOrdering, IsFinite, IsShadowOrdering}
+import onera.pmlanalyzer.views.dependability.exporters.{SubComponent, *}
+import onera.pmlanalyzer.views.dependability.model.CustomTypes.Request
+import onera.pmlanalyzer.views.dependability.operators.*
trait Target[FM] extends Component {
val id: TargetId
diff --git a/src/main/scala/views/dependability/model/Transition.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Transition.scala
similarity index 93%
rename from src/main/scala/views/dependability/model/Transition.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Transition.scala
index 432b4bf..2ea9609 100644
--- a/src/main/scala/views/dependability/model/Transition.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Transition.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
/**
* Representation of automaton transitions
diff --git a/src/main/scala/views/dependability/model/Transporter.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Transporter.scala
similarity index 94%
rename from src/main/scala/views/dependability/model/Transporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Transporter.scala
index b5ecae3..350cbd1 100644
--- a/src/main/scala/views/dependability/model/Transporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Transporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import views.dependability.exporters._
-import views.dependability.model.CustomTypes.{Request, TargetStatus}
-import views.dependability.operators._
+import onera.pmlanalyzer.views.dependability.operators.{IsCriticityOrdering, IsFinite, IsShadowOrdering}
+import onera.pmlanalyzer.views.dependability.exporters.*
+import onera.pmlanalyzer.views.dependability.model.CustomTypes.{Request, TargetStatus}
+import onera.pmlanalyzer.views.dependability.operators.*
abstract class Transporter [FM: IsCriticityOrdering : IsFinite : IsShadowOrdering](implicit owner: Owner) extends Component {
diff --git a/src/main/scala/views/dependability/model/Variable.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Variable.scala
similarity index 95%
rename from src/main/scala/views/dependability/model/Variable.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/model/Variable.scala
index 22fe802..a1029a0 100644
--- a/src/main/scala/views/dependability/model/Variable.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/model/Variable.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.model
+package onera.pmlanalyzer.views.dependability.model
-import pml.model.hardware.{Target => PMLTarget}
-import pml.model.software.Data
-import pml.operators.{Used, _}
+import onera.pmlanalyzer.pml.model.hardware.{Target => PMLTarget}
+import onera.pmlanalyzer.pml.model.software.Data
+import onera.pmlanalyzer.pml.operators.{Used, _}
import scalaz.Leibniz
-import views.dependability.operators.{IsCriticityOrdering, IsFinite}
+import onera.pmlanalyzer.views.dependability.operators.{IsCriticityOrdering, IsFinite}
import scala.language.implicitConversions
diff --git a/src/main/scala/views/dependability/operators/IsCriticityOrdering.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsCriticityOrdering.scala
similarity index 94%
rename from src/main/scala/views/dependability/operators/IsCriticityOrdering.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsCriticityOrdering.scala
index 4551da0..d3ba248 100644
--- a/src/main/scala/views/dependability/operators/IsCriticityOrdering.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsCriticityOrdering.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,8 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.operators
+package onera.pmlanalyzer.views.dependability.operators
+
trait IsCriticityOrdering[T] extends Ordering[T]
trait IsCriticityOrderingOps {
diff --git a/src/main/scala/views/dependability/operators/IsFinite.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsFinite.scala
similarity index 95%
rename from src/main/scala/views/dependability/operators/IsFinite.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsFinite.scala
index f390487..340086b 100644
--- a/src/main/scala/views/dependability/operators/IsFinite.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsFinite.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.operators
+package onera.pmlanalyzer.views.dependability.operators
trait IsFinite[T] {
def typeName: Symbol = Symbol(all.map(fm => name(fm).name.charAt(0).toTitleCase).mkString(""))
diff --git a/src/main/scala/views/dependability/operators/IsMergeable.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsMergeable.scala
similarity index 95%
rename from src/main/scala/views/dependability/operators/IsMergeable.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsMergeable.scala
index a37c720..6cb20c0 100644
--- a/src/main/scala/views/dependability/operators/IsMergeable.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsMergeable.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.operators
+package onera.pmlanalyzer.views.dependability.operators
import scala.language.higherKinds
diff --git a/src/main/scala/views/dependability/operators/IsOptionLike.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsOptionLike.scala
similarity index 94%
rename from src/main/scala/views/dependability/operators/IsOptionLike.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsOptionLike.scala
index 034f4a8..bdf84ac 100644
--- a/src/main/scala/views/dependability/operators/IsOptionLike.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsOptionLike.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.operators
+package onera.pmlanalyzer.views.dependability.operators
trait IsOptionLike[T] {
def isDefined(x:T):Boolean = x == none
diff --git a/src/main/scala/views/dependability/operators/IsShadowOrdering.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsShadowOrdering.scala
similarity index 94%
rename from src/main/scala/views/dependability/operators/IsShadowOrdering.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsShadowOrdering.scala
index 9a689cc..f979e40 100644
--- a/src/main/scala/views/dependability/operators/IsShadowOrdering.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/IsShadowOrdering.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability.operators
+package onera.pmlanalyzer.views.dependability.operators
trait IsShadowOrdering[T] {
def containerShadow(init:T, containerState:T) : T
diff --git a/src/main/scala/views/dependability/operators/package.scala b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/package.scala
similarity index 93%
rename from src/main/scala/views/dependability/operators/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/dependability/operators/package.scala
index eead77d..fbe4f38 100644
--- a/src/main/scala/views/dependability/operators/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/dependability/operators/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.dependability
+package onera.pmlanalyzer.views.dependability
package object operators extends IsFiniteOps
with IsMergeableOps
diff --git a/src/main/scala/views/interference/examples/package.scala b/src/main/scala/onera/pmlanalyzer/views/interference/examples/package.scala
similarity index 93%
rename from src/main/scala/views/interference/examples/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/examples/package.scala
index 06c1bae..189c3f4 100644
--- a/src/main/scala/views/interference/examples/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/examples/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference
+package onera.pmlanalyzer.views.interference
/**
* Package containing PML examples of simple platforms illustrating the basic interference
diff --git a/src/main/scala/views/interference/examples/simpleKeystone/SimpleKeystoneApplicativeTableBasedInterferenceSpecification.scala b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/SimpleKeystoneApplicativeTableBasedInterferenceSpecification.scala
similarity index 79%
rename from src/main/scala/views/interference/examples/simpleKeystone/SimpleKeystoneApplicativeTableBasedInterferenceSpecification.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/SimpleKeystoneApplicativeTableBasedInterferenceSpecification.scala
index 9c23f47..6d805a0 100644
--- a/src/main/scala/views/interference/examples/simpleKeystone/SimpleKeystoneApplicativeTableBasedInterferenceSpecification.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/SimpleKeystoneApplicativeTableBasedInterferenceSpecification.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,18 +15,18 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.examples.simpleKeystone
+package onera.pmlanalyzer.views.interference.examples.simpleKeystone
-import pml.examples.simpleKeystone.{SimpleKeystoneLibraryConfiguration, SimpleKeystonePlatform, SimpleKeystoneTransactionLibrary, SimpleSoftwareAllocation}
-import pml.operators._
-import views.interference.model.specification.ApplicativeTableBasedInterferenceSpecification
-import views.interference.operators._
+import onera.pmlanalyzer.pml.examples.simpleKeystone.{SimpleKeystoneLibraryConfiguration, SimpleKeystonePlatform, SimpleKeystoneTransactionLibrary, SimpleSoftwareAllocation}
+import onera.pmlanalyzer.pml.operators.*
+import onera.pmlanalyzer.views.interference.model.specification.ApplicativeTableBasedInterferenceSpecification
+import onera.pmlanalyzer.views.interference.operators.*
/**
* The interference calculus assumptions for the SimpleKeystone's applications are gathered here.
* For instance app22 and app3 cannot execute simultaneously so
* {{{app22 exclusiveWith app3}}}
- * The app3 transfer transaction does not significantly impact the [[pml.examples.simpleKeystone.SimpleKeystonePlatform.TeraNet]]
+ * The app3 transfer transaction does not significantly impact the [[TeraNet]]
* {{{app3_transfer notInterfereWith TeraNet.periph_bus.loads}}}
* @see [[views.interference.operators.Exclusive.Ops]] for interfere operator definition
*/
diff --git a/src/main/scala/views/interference/examples/simpleKeystone/SimpleKeystoneInterferenceGeneration.scala b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/SimpleKeystoneInterferenceGeneration.scala
similarity index 87%
rename from src/main/scala/views/interference/examples/simpleKeystone/SimpleKeystoneInterferenceGeneration.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/SimpleKeystoneInterferenceGeneration.scala
index 8cd6f05..5cc8ed7 100644
--- a/src/main/scala/views/interference/examples/simpleKeystone/SimpleKeystoneInterferenceGeneration.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/SimpleKeystoneInterferenceGeneration.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.examples.simpleKeystone
+package onera.pmlanalyzer.views.interference.examples.simpleKeystone
-import pml.examples.simpleKeystone.SimpleKeystoneExport.*
-import views.interference.operators.*
+import onera.pmlanalyzer.pml.examples.simpleKeystone.SimpleKeystoneExport.*
+import onera.pmlanalyzer.views.interference.operators.*
import scala.concurrent.duration.*
import scala.language.postfixOps
diff --git a/src/main/scala/views/interference/examples/simpleKeystone/SimpleKeystonePhysicalTableBasedInterferenceSpecification.scala b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/SimpleKeystonePhysicalTableBasedInterferenceSpecification.scala
similarity index 87%
rename from src/main/scala/views/interference/examples/simpleKeystone/SimpleKeystonePhysicalTableBasedInterferenceSpecification.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/SimpleKeystonePhysicalTableBasedInterferenceSpecification.scala
index 73edb78..9ad5322 100644
--- a/src/main/scala/views/interference/examples/simpleKeystone/SimpleKeystonePhysicalTableBasedInterferenceSpecification.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/SimpleKeystonePhysicalTableBasedInterferenceSpecification.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,12 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.examples.simpleKeystone
+package onera.pmlanalyzer.views.interference.examples.simpleKeystone
-import pml.examples.simpleKeystone.SimpleKeystonePlatform
-import pml.operators._
-import views.interference.model.specification.PhysicalTableBasedInterferenceSpecification
-import views.interference.operators._
+import onera.pmlanalyzer.pml.examples.simpleKeystone.SimpleKeystonePlatform
+import onera.pmlanalyzer.pml.operators._
+import onera.pmlanalyzer.views.interference.model.specification.PhysicalTableBasedInterferenceSpecification
+import onera.pmlanalyzer.views.interference.operators._
/**
* The interference calculus assumptions for the hardware components of the SimpleKeystone are gathered here.
diff --git a/src/main/scala/views/interference/examples/simpleKeystone/package.scala b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/package.scala
similarity index 94%
rename from src/main/scala/views/interference/examples/simpleKeystone/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/package.scala
index 8420f99..2a0e579 100644
--- a/src/main/scala/views/interference/examples/simpleKeystone/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleKeystone/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.examples
+package onera.pmlanalyzer.views.interference.examples
/**
* Package containing an example on a simplification of a TI Keystone platform
diff --git a/src/main/scala/views/interference/examples/simpleT1042/SimpleT1042InterferenceGeneration.scala b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleT1042/SimpleT1042InterferenceGeneration.scala
similarity index 86%
rename from src/main/scala/views/interference/examples/simpleT1042/SimpleT1042InterferenceGeneration.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleT1042/SimpleT1042InterferenceGeneration.scala
index adc0a29..46e7025 100644
--- a/src/main/scala/views/interference/examples/simpleT1042/SimpleT1042InterferenceGeneration.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleT1042/SimpleT1042InterferenceGeneration.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.examples.simpleT1042
+package onera.pmlanalyzer.views.interference.examples.simpleT1042
-import pml.examples.simpleT1042.SimpleT1042Export._
-import views.interference.operators._
+import onera.pmlanalyzer.pml.examples.simpleT1042.SimpleT1042Export._
+import onera.pmlanalyzer.views.interference.operators._
import scala.concurrent.duration._
import scala.language.postfixOps
diff --git a/src/main/scala/views/interference/examples/simpleT1042/SimpleT1042TableBasedInterferenceSpecification.scala b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleT1042/SimpleT1042TableBasedInterferenceSpecification.scala
similarity index 77%
rename from src/main/scala/views/interference/examples/simpleT1042/SimpleT1042TableBasedInterferenceSpecification.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleT1042/SimpleT1042TableBasedInterferenceSpecification.scala
index 18f494e..8b92c7b 100644
--- a/src/main/scala/views/interference/examples/simpleT1042/SimpleT1042TableBasedInterferenceSpecification.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/examples/simpleT1042/SimpleT1042TableBasedInterferenceSpecification.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,12 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.examples.simpleT1042
+package onera.pmlanalyzer.views.interference.examples.simpleT1042
-import pml.examples.simpleT1042.{SimpleSoftwareAllocation, SimpleT1042LibraryConfiguration, SimpleT1042Platform, SimpleT1042TransactionLibrary}
-import pml.operators._
-import views.interference.model.specification.{ApplicativeTableBasedInterferenceSpecification, PhysicalTableBasedInterferenceSpecification}
-import views.interference.operators._
+import onera.pmlanalyzer.pml.examples.simpleT1042.{SimpleSoftwareAllocation, SimpleT1042LibraryConfiguration, SimpleT1042Platform, SimpleT1042TransactionLibrary}
+import onera.pmlanalyzer.pml.operators._
+import onera.pmlanalyzer.views.interference.model.specification.{ApplicativeTableBasedInterferenceSpecification, PhysicalTableBasedInterferenceSpecification}
+import onera.pmlanalyzer.views.interference.operators._
trait SimpleT1042PhysicalTableBasedInterferenceSpecification extends PhysicalTableBasedInterferenceSpecification {
self: SimpleT1042Platform =>
diff --git a/src/main/scala/views/interference/exporters/IDPExporter.scala b/src/main/scala/onera/pmlanalyzer/views/interference/exporters/IDPExporter.scala
similarity index 95%
rename from src/main/scala/views/interference/exporters/IDPExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/exporters/IDPExporter.scala
index a92c032..24fd7b0 100644
--- a/src/main/scala/views/interference/exporters/IDPExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/exporters/IDPExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,16 +15,16 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.exporters
+package onera.pmlanalyzer.views.interference.exporters
-import pml.exporters.FileManager
-import pml.model.configuration.TransactionLibrary
-import pml.model.hardware.{Initiator, Platform, Target, Transporter}
-import pml.model.utils.Message
-import pml.operators._
+import onera.pmlanalyzer.pml.exporters.FileManager
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.hardware.{Initiator, Platform, Target, Transporter}
+import onera.pmlanalyzer.pml.model.utils.Message
+import onera.pmlanalyzer.pml.operators._
import scalaz.Memo.immutableHashMapMemo
-import views.interference.model.specification.InterferenceSpecification
-import views.interference.model.specification.InterferenceSpecification._
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification._
import java.io.{FileWriter, Writer}
import scala.collection.mutable.{HashMap => MHashMap}
diff --git a/src/main/scala/views/interference/exporters/InterferenceGraphExporter.scala b/src/main/scala/onera/pmlanalyzer/views/interference/exporters/InterferenceGraphExporter.scala
similarity index 83%
rename from src/main/scala/views/interference/exporters/InterferenceGraphExporter.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/exporters/InterferenceGraphExporter.scala
index 482d1d4..2429003 100644
--- a/src/main/scala/views/interference/exporters/InterferenceGraphExporter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/exporters/InterferenceGraphExporter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.exporters
+package onera.pmlanalyzer.views.interference.exporters
-import pml.exporters.UMLExporter.DOTServiceOnly
-import pml.exporters.{FileManager, UMLExporter}
-import pml.model.hardware.Platform
-import views.interference.model.specification.InterferenceSpecification
-import views.interference.model.specification.InterferenceSpecification.{PhysicalScenarioId, scenarioSetId}
+import onera.pmlanalyzer.pml.exporters.UMLExporter.DOTServiceOnly
+import onera.pmlanalyzer.pml.exporters.{FileManager, UMLExporter}
+import onera.pmlanalyzer.pml.model.hardware.Platform
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.{PhysicalScenarioId, scenarioSetId}
import java.io.FileWriter
diff --git a/src/main/scala/views/interference/exporters/package.scala b/src/main/scala/onera/pmlanalyzer/views/interference/exporters/package.scala
similarity index 90%
rename from src/main/scala/views/interference/exporters/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/exporters/package.scala
index b37a885..86e9c3f 100644
--- a/src/main/scala/views/interference/exporters/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/exporters/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference
+package onera.pmlanalyzer.views.interference
//FIXME The usage of exporters is not illustrated in examples
/**
* Package containing the interference related exporters
* {{{
- * scala> import views.interference.exporters._
+ * scala> import onera.pmlanalyzer.views.interference.exporters._
* }}}
* The available extension methods are provided in [[IDPExporter.Ops]] and [[InterferenceGraphExporter.Ops]]
* Example of usages are provided in ???
diff --git a/src/main/scala/views/interference/model/formalisation/BDDFactory.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/formalisation/BDDFactory.scala
similarity index 99%
rename from src/main/scala/views/interference/model/formalisation/BDDFactory.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/formalisation/BDDFactory.scala
index c050ab8..99863b2 100644
--- a/src/main/scala/views/interference/model/formalisation/BDDFactory.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/formalisation/BDDFactory.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.formalisation
+package onera.pmlanalyzer.views.interference.model.formalisation
import net.sf.javabdd.{BDD => JavaBDD, BDDFactory => JavaBDDFactory}
diff --git a/src/main/scala/views/interference/model/formalisation/ProblemElement.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/formalisation/ProblemElement.scala
similarity index 92%
rename from src/main/scala/views/interference/model/formalisation/ProblemElement.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/formalisation/ProblemElement.scala
index da64583..42e45ad 100644
--- a/src/main/scala/views/interference/model/formalisation/ProblemElement.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/formalisation/ProblemElement.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,18 +15,18 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.formalisation
+package onera.pmlanalyzer.views.interference.model.formalisation
import monosat.Logic._
import monosat.{Comparison, Graph, Lit, Solver}
-import pml.model.configuration.TransactionLibrary
-import pml.model.configuration.TransactionLibrary.UserScenarioId
-import pml.model.hardware.Platform
-import pml.model.service.Service
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary.UserScenarioId
+import onera.pmlanalyzer.pml.model.hardware.Platform
+import onera.pmlanalyzer.pml.model.service.Service
import scalaz.Memo.immutableHashMapMemo
-import views.interference.model.formalisation.ProblemElement._
-import views.interference.model.specification.InterferenceSpecification.{Channel, PhysicalScenario, PhysicalScenarioId}
-import views.interference.model.specification.{ApplicativeTableBasedInterferenceSpecification, InterferenceSpecification}
+import onera.pmlanalyzer.views.interference.model.formalisation.ProblemElement._
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.{Channel, PhysicalScenario, PhysicalScenarioId}
+import onera.pmlanalyzer.views.interference.model.specification.{ApplicativeTableBasedInterferenceSpecification, InterferenceSpecification}
import scala.jdk.CollectionConverters._
diff --git a/src/main/scala/views/interference/model/formalisation/package.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/formalisation/package.scala
similarity index 94%
rename from src/main/scala/views/interference/model/formalisation/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/formalisation/package.scala
index 3fd1563..ee76132 100644
--- a/src/main/scala/views/interference/model/formalisation/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/formalisation/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model
+package onera.pmlanalyzer.views.interference.model
/**
* Package containing model extension enabling formalisation of the interference computation problem as an SMT problem.
diff --git a/src/main/scala/views/interference/model/package.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/package.scala
similarity index 94%
rename from src/main/scala/views/interference/model/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/package.scala
index a49b8fd..47b0952 100644
--- a/src/main/scala/views/interference/model/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference
+package onera.pmlanalyzer.views.interference
/**
* Package containing the model extensions for interference analysis
diff --git a/src/main/scala/views/interference/model/relations/EquivalenceRelation.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/EquivalenceRelation.scala
similarity index 82%
rename from src/main/scala/views/interference/model/relations/EquivalenceRelation.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/relations/EquivalenceRelation.scala
index 78f50f3..3f431d2 100644
--- a/src/main/scala/views/interference/model/relations/EquivalenceRelation.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/EquivalenceRelation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.relations
+package onera.pmlanalyzer.views.interference.model.relations
-import pml.model.relations.{ReflexiveSymmetricEndomorphism, Endomorphism}
-import pml.model.service.Service
-import pml.model.utils.Message
+import onera.pmlanalyzer.pml.model.relations.{ReflexiveSymmetricEndomorphism, Endomorphism}
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.model.utils.Message
import sourcecode.Name
case class EquivalenceRelation[A] private(iniValues: Map[A, Set[A]])(using n:Name) extends ReflexiveSymmetricEndomorphism[A](iniValues)
diff --git a/src/main/scala/views/interference/model/relations/ExclusiveRelation.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/ExclusiveRelation.scala
similarity index 81%
rename from src/main/scala/views/interference/model/relations/ExclusiveRelation.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/relations/ExclusiveRelation.scala
index ebbe6f9..fc1003c 100644
--- a/src/main/scala/views/interference/model/relations/ExclusiveRelation.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/ExclusiveRelation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.relations
+package onera.pmlanalyzer.views.interference.model.relations
-import pml.model.configuration.TransactionLibrary.UserScenarioId
-import pml.model.relations.{AntiReflexiveSymmetricEndomorphism, Endomorphism}
-import pml.model.software.Application
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary.UserScenarioId
+import onera.pmlanalyzer.pml.model.relations.{AntiReflexiveSymmetricEndomorphism, Endomorphism}
+import onera.pmlanalyzer.pml.model.software.Application
import sourcecode.Name
-import views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
case class ExclusiveRelation[A] private(iniValues: Map[A, Set[A]])(using n:Name) extends AntiReflexiveSymmetricEndomorphism[A](iniValues)
diff --git a/src/main/scala/views/interference/model/relations/InterfereRelation.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/InterfereRelation.scala
similarity index 84%
rename from src/main/scala/views/interference/model/relations/InterfereRelation.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/relations/InterfereRelation.scala
index 7f029bb..2c47d30 100644
--- a/src/main/scala/views/interference/model/relations/InterfereRelation.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/InterfereRelation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,12 +15,12 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.relations
+package onera.pmlanalyzer.views.interference.model.relations
-import pml.model.hardware.Hardware
-import pml.model.relations.Relation
-import pml.model.service.Service
-import views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
+import onera.pmlanalyzer.pml.model.hardware.Hardware
+import onera.pmlanalyzer.pml.model.relations.Relation
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
case class InterfereRelation[L,R] private(iniValues: Map[L, Set[R]]) extends Relation[L,R](iniValues)
diff --git a/src/main/scala/views/interference/model/relations/NotInterfereRelation.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/NotInterfereRelation.scala
similarity index 84%
rename from src/main/scala/views/interference/model/relations/NotInterfereRelation.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/relations/NotInterfereRelation.scala
index 2f6caf1..ad6ee5a 100644
--- a/src/main/scala/views/interference/model/relations/NotInterfereRelation.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/NotInterfereRelation.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.relations
+package onera.pmlanalyzer.views.interference.model.relations
-import pml.model.hardware.Hardware
-import pml.model.relations.Relation
-import pml.model.service.Service
+import onera.pmlanalyzer.pml.model.hardware.Hardware
+import onera.pmlanalyzer.pml.model.relations.Relation
+import onera.pmlanalyzer.pml.model.service.Service
import sourcecode.Name
-import views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
case class NotInterfereRelation[L,R] private(iniValues: Map[L, Set[R]])(using n:Name) extends Relation[L,R](iniValues)
diff --git a/src/main/scala/views/interference/model/relations/TransparentSet.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/TransparentSet.scala
similarity index 87%
rename from src/main/scala/views/interference/model/relations/TransparentSet.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/relations/TransparentSet.scala
index 8c4de49..9b86cca 100644
--- a/src/main/scala/views/interference/model/relations/TransparentSet.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/TransparentSet.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.relations
+package onera.pmlanalyzer.views.interference.model.relations
import sourcecode.Name
-import views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
import scala.collection.mutable.Set as MSet
diff --git a/src/main/scala/views/interference/model/relations/package.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/package.scala
similarity index 92%
rename from src/main/scala/views/interference/model/relations/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/relations/package.scala
index 7d48be5..d6bce4e 100644
--- a/src/main/scala/views/interference/model/relations/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/relations/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,6 +15,6 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model
+package onera.pmlanalyzer.views.interference.model
package object relations
diff --git a/src/main/scala/views/interference/model/specification/ApplicativeTableBasedInterferenceSpecification.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/ApplicativeTableBasedInterferenceSpecification.scala
similarity index 81%
rename from src/main/scala/views/interference/model/specification/ApplicativeTableBasedInterferenceSpecification.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/specification/ApplicativeTableBasedInterferenceSpecification.scala
index bd4bc59..c8bb096 100644
--- a/src/main/scala/views/interference/model/specification/ApplicativeTableBasedInterferenceSpecification.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/ApplicativeTableBasedInterferenceSpecification.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.specification
+package onera.pmlanalyzer.views.interference.model.specification
-import pml.model.configuration.TransactionLibrary
-import pml.model.configuration.TransactionLibrary.UserScenarioId
-import pml.model.hardware.Platform
-import views.interference.model.relations.ExclusiveRelation
-import views.interference.operators.Transform
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary.UserScenarioId
+import onera.pmlanalyzer.pml.model.hardware.Platform
+import onera.pmlanalyzer.views.interference.model.relations.ExclusiveRelation
+import onera.pmlanalyzer.views.interference.operators.Transform
trait ApplicativeTableBasedInterferenceSpecification extends TableBasedInterferenceSpecification
with Transform.TransactionLibraryInstances
diff --git a/src/main/scala/views/interference/model/specification/InterferenceSpecification.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/InterferenceSpecification.scala
similarity index 96%
rename from src/main/scala/views/interference/model/specification/InterferenceSpecification.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/specification/InterferenceSpecification.scala
index 6021b05..b27e0b2 100644
--- a/src/main/scala/views/interference/model/specification/InterferenceSpecification.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/InterferenceSpecification.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,14 +15,14 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.specification
+package onera.pmlanalyzer.views.interference.model.specification
-import pml.model.configuration.TransactionLibrary
-import pml.model.hardware.{Hardware, Platform}
-import pml.model.service.Service
-import pml.operators._
-import views.interference.model.specification.InterferenceSpecification.{PhysicalScenario, PhysicalScenarioId, PhysicalTransaction, PhysicalTransactionId}
-import views.interference.operators.Transform
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Platform}
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.operators._
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.{PhysicalScenario, PhysicalScenarioId, PhysicalTransaction, PhysicalTransactionId}
+import onera.pmlanalyzer.views.interference.operators.Transform
/**
* Base trait for all interference specification
diff --git a/src/main/scala/views/interference/model/specification/PhysicalTableBasedInterferenceSpecification.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/PhysicalTableBasedInterferenceSpecification.scala
similarity index 87%
rename from src/main/scala/views/interference/model/specification/PhysicalTableBasedInterferenceSpecification.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/specification/PhysicalTableBasedInterferenceSpecification.scala
index bf12c88..f6f76d5 100644
--- a/src/main/scala/views/interference/model/specification/PhysicalTableBasedInterferenceSpecification.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/PhysicalTableBasedInterferenceSpecification.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.specification
+package onera.pmlanalyzer.views.interference.model.specification
-import pml.model.hardware.Platform
+import onera.pmlanalyzer.pml.model.hardware.Platform
trait PhysicalTableBasedInterferenceSpecification extends TableBasedInterferenceSpecification {
self: Platform =>
diff --git a/src/main/scala/views/interference/model/specification/TableBasedInterferenceSpecification.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/TableBasedInterferenceSpecification.scala
similarity index 86%
rename from src/main/scala/views/interference/model/specification/TableBasedInterferenceSpecification.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/specification/TableBasedInterferenceSpecification.scala
index 7a5c40e..2a0a391 100644
--- a/src/main/scala/views/interference/model/specification/TableBasedInterferenceSpecification.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/TableBasedInterferenceSpecification.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,16 +15,19 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model.specification
-
-import pml.exporters.FileManager
-import pml.model.configuration.TransactionLibrary
-import pml.model.hardware.{Hardware, Platform}
-import pml.model.service.Service
-import pml.model.software.Application
-import pml.operators.{Provided, *}
-import views.interference.model.relations.*
-import views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
+package onera.pmlanalyzer.views.interference.model.specification
+
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.hardware.Platform
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.exporters.FileManager
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Platform}
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.model.software.Application
+import onera.pmlanalyzer.pml.operators.{Provided, *}
+import onera.pmlanalyzer.views.interference.model.relations.*
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
import java.io.FileWriter
import scala.collection.mutable.Set as MSet
diff --git a/src/main/scala/views/interference/model/specification/package.scala b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/package.scala
similarity index 96%
rename from src/main/scala/views/interference/model/specification/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/model/specification/package.scala
index b681a47..7dd324d 100644
--- a/src/main/scala/views/interference/model/specification/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/model/specification/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.model
+package onera.pmlanalyzer.views.interference.model
/**
* Package containing the modelling features used to specify the assumptions considered during the interference analysis.
diff --git a/src/main/scala/views/interference/operators/Analyse.scala b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Analyse.scala
similarity index 97%
rename from src/main/scala/views/interference/operators/Analyse.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/operators/Analyse.scala
index ffb39fe..b371717 100644
--- a/src/main/scala/views/interference/operators/Analyse.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Analyse.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,23 +15,23 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.operators
+package onera.pmlanalyzer.views.interference.operators
import monosat.*
import monosat.Logic.*
import net.sf.javabdd.BDD
-import pml.exporters.FileManager
-import pml.model.configuration.TransactionLibrary
-import pml.model.configuration.TransactionLibrary.UserScenarioId
-import pml.model.hardware.{Hardware, Platform}
-import pml.model.service.Service
-import pml.model.utils.Message
-import pml.operators.*
+import onera.pmlanalyzer.pml.exporters.FileManager
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary.UserScenarioId
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Platform}
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.pml.model.utils.Message
+import onera.pmlanalyzer.pml.operators.*
import scalaz.Memo.immutableHashMapMemo
-import views.interference.model.formalisation.*
-import views.interference.model.formalisation.ProblemElement.*
-import views.interference.model.specification.InterferenceSpecification.*
-import views.interference.model.specification.{ApplicativeTableBasedInterferenceSpecification, InterferenceSpecification}
+import onera.pmlanalyzer.views.interference.model.formalisation.*
+import onera.pmlanalyzer.views.interference.model.formalisation.ProblemElement.*
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.*
+import onera.pmlanalyzer.views.interference.model.specification.{ApplicativeTableBasedInterferenceSpecification, InterferenceSpecification}
import java.io.{File, FileWriter}
import scala.collection.immutable.SortedMap
diff --git a/src/main/scala/views/interference/operators/Equivalent.scala b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Equivalent.scala
similarity index 88%
rename from src/main/scala/views/interference/operators/Equivalent.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/operators/Equivalent.scala
index 9b98105..6c66b46 100644
--- a/src/main/scala/views/interference/operators/Equivalent.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Equivalent.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.operators
+package onera.pmlanalyzer.views.interference.operators
-import views.interference.model.relations.EquivalenceRelation
+import onera.pmlanalyzer.views.interference.model.relations.EquivalenceRelation
private[operators] trait Equivalent[T] {
def equivalent(l:T,r:T):Unit
diff --git a/src/main/scala/views/interference/operators/Exclusive.scala b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Exclusive.scala
similarity index 89%
rename from src/main/scala/views/interference/operators/Exclusive.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/operators/Exclusive.scala
index 6fb7d1e..e79715e 100644
--- a/src/main/scala/views/interference/operators/Exclusive.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Exclusive.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,9 +15,9 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.operators
+package onera.pmlanalyzer.views.interference.operators
-import views.interference.model.relations.ExclusiveRelation
+import onera.pmlanalyzer.views.interference.model.relations.ExclusiveRelation
private[operators] trait Exclusive[T] {
def apply(l:T, r:T): Unit
diff --git a/src/main/scala/views/interference/operators/Interfere.scala b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Interfere.scala
similarity index 91%
rename from src/main/scala/views/interference/operators/Interfere.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/operators/Interfere.scala
index 3f1fc24..39d4657 100644
--- a/src/main/scala/views/interference/operators/Interfere.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Interfere.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.operators
+package onera.pmlanalyzer.views.interference.operators
-import pml.model.service.Service
-import views.interference.model.relations.{InterfereRelation, NotInterfereRelation}
-import views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
+import onera.pmlanalyzer.pml.model.service.Service
+import onera.pmlanalyzer.views.interference.model.relations.{InterfereRelation, NotInterfereRelation}
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
private[operators] trait Interfere[L, R] {
def interfereWith(l: L, r: R): Unit
diff --git a/src/main/scala/views/interference/operators/PostProcess.scala b/src/main/scala/onera/pmlanalyzer/views/interference/operators/PostProcess.scala
similarity index 96%
rename from src/main/scala/views/interference/operators/PostProcess.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/operators/PostProcess.scala
index 4b33666..2d765b6 100644
--- a/src/main/scala/views/interference/operators/PostProcess.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/operators/PostProcess.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,15 +15,15 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.operators
+package onera.pmlanalyzer.views.interference.operators
-import pml.exporters.FileManager
-import pml.model.configuration.TransactionLibrary
-import pml.model.hardware.{Hardware, Platform}
-import pml.model.software.Application
-import pml.model.utils.Message
-import pml.operators._
-import views.interference.operators.Analyse.ConfiguredPlatform
+import onera.pmlanalyzer.pml.exporters.FileManager
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Platform}
+import onera.pmlanalyzer.pml.model.software.Application
+import onera.pmlanalyzer.pml.model.utils.Message
+import onera.pmlanalyzer.pml.operators._
+import onera.pmlanalyzer.views.interference.operators.Analyse.ConfiguredPlatform
import java.io.{File, FileWriter}
import scala.concurrent.ExecutionContext.Implicits._
diff --git a/src/main/scala/views/interference/operators/Transform.scala b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Transform.scala
similarity index 85%
rename from src/main/scala/views/interference/operators/Transform.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/operators/Transform.scala
index 1d9158f..24127ad 100644
--- a/src/main/scala/views/interference/operators/Transform.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Transform.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.operators
+package onera.pmlanalyzer.views.interference.operators
-import pml.model.configuration.TransactionLibrary
-import pml.model.configuration.TransactionLibrary.{UserScenarioId, UserTransactionId}
-import pml.model.hardware.Platform
-import pml.model.software.Application
-import views.interference.model.specification.InterferenceSpecification.{PhysicalTransaction, PhysicalTransactionId}
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary
+import onera.pmlanalyzer.pml.model.configuration.TransactionLibrary.{UserScenarioId, UserTransactionId}
+import onera.pmlanalyzer.pml.model.hardware.Platform
+import onera.pmlanalyzer.pml.model.software.Application
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.{PhysicalTransaction, PhysicalTransactionId}
private[operators] trait Transform[L,R]{
def apply(l:L):R
diff --git a/src/main/scala/views/interference/operators/Transparent.scala b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Transparent.scala
similarity index 87%
rename from src/main/scala/views/interference/operators/Transparent.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/operators/Transparent.scala
index 93608a3..976a814 100644
--- a/src/main/scala/views/interference/operators/Transparent.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/operators/Transparent.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference.operators
+package onera.pmlanalyzer.views.interference.operators
-import views.interference.model.relations.TransparentSet
-import views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
+import onera.pmlanalyzer.views.interference.model.relations.TransparentSet
+import onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.PhysicalTransactionId
private[operators] trait Transparent[T] {
def apply(x:T):Unit
diff --git a/src/main/scala/views/interference/operators/package.scala b/src/main/scala/onera/pmlanalyzer/views/interference/operators/package.scala
similarity index 93%
rename from src/main/scala/views/interference/operators/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/operators/package.scala
index 76e5b98..73eb8b7 100644
--- a/src/main/scala/views/interference/operators/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/operators/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,13 +15,13 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.interference
+package onera.pmlanalyzer.views.interference
/**
* Package containing the operators related to interference computation that can be used on a PML model.
* Examples are provided in [[views.interference.examples.simpleKeystone.SimpleKeystoneInterferenceGeneration]]
* @note This package should be imported in all pml models as so
- * {{{import views.interference.operators._}}}
+ * {{{import onera.pmlanalyzer.views.interference.operators._}}}
* @see [[Analyse.Ops]] provides the operators related to interference computation with Monosat [[https://github.com/sambayless/monosat]]
* @see [[PostProcess.Ops]] provides the operators related to the post processing of the interference computation
* @see [[Interfere.Ops]] provides the operators related to interference assumptions
diff --git a/src/main/scala/views/interference/package.scala b/src/main/scala/onera/pmlanalyzer/views/interference/package.scala
similarity index 97%
rename from src/main/scala/views/interference/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/interference/package.scala
index 6d7073c..e0569cb 100644
--- a/src/main/scala/views/interference/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/interference/package.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views
+package onera.pmlanalyzer.views
/**
* Package containing all interference modelling and analysis features of PML
diff --git a/src/main/scala/views/package.scala b/src/main/scala/onera/pmlanalyzer/views/package.scala
similarity index 55%
rename from src/main/scala/views/package.scala
rename to src/main/scala/onera/pmlanalyzer/views/package.scala
index 9f52228..e02ece5 100644
--- a/src/main/scala/views/package.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/package.scala
@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer
/*******************************************************************************
* Copyright (c) 2021. ONERA
diff --git a/src/main/scala/views/patterns/examples/PhylogPatterns.scala b/src/main/scala/onera/pmlanalyzer/views/patterns/examples/PhylogPatterns.scala
similarity index 97%
rename from src/main/scala/views/patterns/examples/PhylogPatterns.scala
rename to src/main/scala/onera/pmlanalyzer/views/patterns/examples/PhylogPatterns.scala
index 5909945..bf9f15d 100644
--- a/src/main/scala/views/patterns/examples/PhylogPatterns.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/patterns/examples/PhylogPatterns.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,11 +15,11 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.patterns.examples
+package onera.pmlanalyzer.views.patterns.examples
-import views.patterns.exporters.LatexCodePrinter._
-import views.patterns.exporters.LatexDiagramPrinter._
-import views.patterns.model.DSLImplicits._
+import onera.pmlanalyzer.views.patterns.exporters.LatexCodePrinter._
+import onera.pmlanalyzer.views.patterns.exporters.LatexDiagramPrinter._
+import onera.pmlanalyzer.views.patterns.model.DSLImplicits._
import scala.sys.process.Process
diff --git a/src/main/scala/views/patterns/exporters/LatexCodePrinter.scala b/src/main/scala/onera/pmlanalyzer/views/patterns/exporters/LatexCodePrinter.scala
similarity index 95%
rename from src/main/scala/views/patterns/exporters/LatexCodePrinter.scala
rename to src/main/scala/onera/pmlanalyzer/views/patterns/exporters/LatexCodePrinter.scala
index e2611ad..085cca5 100644
--- a/src/main/scala/views/patterns/exporters/LatexCodePrinter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/patterns/exporters/LatexCodePrinter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.patterns.exporters
+package onera.pmlanalyzer.views.patterns.exporters
-import pml.exporters.FileManager
-import views.patterns.model._
+import onera.pmlanalyzer.pml.exporters.FileManager
+import onera.pmlanalyzer.views.patterns.model._
import java.io.{File, FileWriter}
diff --git a/src/main/scala/views/patterns/exporters/LatexDiagramPrinter.scala b/src/main/scala/onera/pmlanalyzer/views/patterns/exporters/LatexDiagramPrinter.scala
similarity index 96%
rename from src/main/scala/views/patterns/exporters/LatexDiagramPrinter.scala
rename to src/main/scala/onera/pmlanalyzer/views/patterns/exporters/LatexDiagramPrinter.scala
index 708e5e9..618a868 100644
--- a/src/main/scala/views/patterns/exporters/LatexDiagramPrinter.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/patterns/exporters/LatexDiagramPrinter.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,10 +15,10 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.patterns.exporters
+package onera.pmlanalyzer.views.patterns.exporters
-import pml.exporters.FileManager
-import views.patterns.model._
+import onera.pmlanalyzer.pml.exporters.FileManager
+import onera.pmlanalyzer.views.patterns.model._
import java.io.{File, FileWriter}
import java.nio.file.Paths
diff --git a/src/main/scala/views/patterns/exporters/allPrinters.scala b/src/main/scala/onera/pmlanalyzer/views/patterns/exporters/allPrinters.scala
similarity index 92%
rename from src/main/scala/views/patterns/exporters/allPrinters.scala
rename to src/main/scala/onera/pmlanalyzer/views/patterns/exporters/allPrinters.scala
index ebc28db..e93c9f4 100644
--- a/src/main/scala/views/patterns/exporters/allPrinters.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/patterns/exporters/allPrinters.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,6 +15,6 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.patterns.exporters
+package onera.pmlanalyzer.views.patterns.exporters
object allPrinters extends LatexCodePrinter with LatexDiagramPrinter
diff --git a/src/main/scala/views/patterns/model/PatternAST.scala b/src/main/scala/onera/pmlanalyzer/views/patterns/model/PatternAST.scala
similarity index 98%
rename from src/main/scala/views/patterns/model/PatternAST.scala
rename to src/main/scala/onera/pmlanalyzer/views/patterns/model/PatternAST.scala
index 1d7d60c..d73c125 100644
--- a/src/main/scala/views/patterns/model/PatternAST.scala
+++ b/src/main/scala/onera/pmlanalyzer/views/patterns/model/PatternAST.scala
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2021. ONERA
+ * Copyright (c) 2023. ONERA
* This file is part of PML Analyzer
*
* PML Analyzer is free software ;
@@ -15,7 +15,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-package views.patterns.model
+package onera.pmlanalyzer.views.patterns.model
import scala.language.implicitConversions
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/configuration/ConfigurationTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/configuration/ConfigurationTest.scala
new file mode 100644
index 0000000..c941346
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/configuration/ConfigurationTest.scala
@@ -0,0 +1,176 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.configuration
+
+import onera.pmlanalyzer.pml.model.hardware.*
+import onera.pmlanalyzer.pml.model.service.*
+import onera.pmlanalyzer.pml.model.software.*
+import onera.pmlanalyzer.pml.operators._
+import onera.pmlanalyzer.pml.exporters._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
+import sourcecode.Name
+
+class ConfigurationTest extends AnyFlatSpec with ScalaCheckPropertyChecks with should.Matchers{
+
+ /**
+ * Architecture of the graph formulation of https://www.overleaf.com/project/5efb44712eb0ec00010737b3
+ */
+ object ConfigurationFixture extends Platform(Symbol("fixture"))
+ with ApplicationTest
+ with LoadTest
+ with StoreTest
+ with TargetTest
+ with SimpleTransporterTest
+ with SmartTest {
+ val configName: Symbol = "conf"
+
+ val dma1: Initiator = Initiator()
+
+ val smart1: Core = new Core()
+ val smart2: Core = new Core()
+
+ class Core(name: Symbol) extends Composite(name) {
+
+ val core: Initiator = Initiator()
+ val cache: Target = Target()
+ val cpu: SimpleTransporter = SimpleTransporter()
+
+ core link cpu
+ cpu link cache
+
+ def this()(implicit name:Name) = {
+ this(name.value)
+ }
+ }
+ val pamu: Virtualizer = Virtualizer()
+ val mem1: Target = Target()
+ val mem2: Target = Target()
+ val pcie: Target = Target()
+ val bus: SimpleTransporter = SimpleTransporter()
+
+ smart1.core link bus
+ smart2.core link bus
+ dma1 link pamu
+ pamu link bus
+ bus link mem1
+ bus link mem2
+ bus link pcie
+
+ //add direct access of dma to caches
+ pamu link smart1.cache
+ pamu link smart2.cache
+
+ val appSmart1: Application = Application()
+ val appSmart21: Application = Application()
+ val dmaDescriptor: Application = Application()
+ val appSmart22:Application = Application()
+
+ val dataMem1: Data = Data()
+ val dataMem2: Data = Data()
+
+ dataMem1 hostedBy mem1
+ dataMem2 hostedBy mem2
+
+ appSmart1 hostedBy smart1.core
+ appSmart21 hostedBy smart2.core
+ appSmart22 hostedBy smart2.core
+
+ appSmart1 read dataMem1
+ appSmart21 write dataMem1
+ appSmart22 read dataMem2
+
+
+
+ //WARNING THE USAGE OF COPIES BY DESCRIPTOR MUST BE DONE AFTER SPECIFYING THEM
+ dmaDescriptor hostedBy dma1
+ dmaDescriptor read dataMem1
+ dmaDescriptor write smart1.cache
+ dmaDescriptor read dataMem2
+ dmaDescriptor write smart2.cache
+
+ //THIS ROUTE IS VOLUNTARY IMPOSSIBLE SINCE BUS CANNOT ACCESS TO CACHES
+ dma1 targeting smart1.cache useLink pamu to bus
+ dma1 targeting smart2.cache useLink pamu to smart2.cache
+
+ }
+
+ import ConfigurationFixture.*
+
+ ConfigurationFixture.exportRestrictedServiceAndSWGraph()
+ ConfigurationFixture.exportRestrictedHWAndSWGraph()
+ ConfigurationFixture.exportHWAndSWGraph()
+
+ "A configured platform" should "encode the used relation properly" in {
+
+ appSmart1.targetLoads shouldBe mem1.loads
+ appSmart1.targetStores shouldBe Set.empty
+ appSmart1.hostingInitiators shouldBe Set(smart1.core)
+
+ appSmart21.targetStores shouldBe mem1.stores
+ appSmart21.targetLoads shouldBe empty
+ appSmart21.hostingInitiators shouldBe Set(smart2.core)
+
+ appSmart22.targetLoads shouldBe mem2.loads
+ appSmart22.targetStores shouldBe empty
+ appSmart22.hostingInitiators shouldBe Set(smart2.core)
+
+ dmaDescriptor.hostingInitiators shouldBe Set(dma1)
+ dmaDescriptor.targetLoads shouldBe (dataMem1.loads and dataMem2.loads)
+ dmaDescriptor.targetStores shouldBe (smart1.cache.stores and smart2.cache.stores)
+ }
+
+ it should "encode the routing relation properly" in {
+ for (st <- smart1.cache.stores; on <- pamu.stores) {
+ InitiatorRouting.get((dma1,st,on)) shouldBe defined
+ InitiatorRouting((dma1,st,on)) shouldBe bus.stores
+ }
+ for (st <- smart2.cache.stores; on <- pamu.stores) {
+ InitiatorRouting.get((dma1,st,on)) shouldBe defined
+ InitiatorRouting((dma1,st,on)) shouldBe smart2.cache.stores
+ }
+ }
+
+ it should "derive the used transaction properly" in {
+ transactionsBySW(appSmart1).size shouldBe 1
+ mem1.loads should contain(transactionsByName(transactionsBySW(appSmart1).head).last)
+ transactionsBySW(appSmart21).size shouldBe 1
+ transactionsBySW(appSmart22).size shouldBe 1
+ //One transaction is missing
+ transactionsBySW(dmaDescriptor).size shouldBe 3
+ }
+
+ it should "detect cyclic service paths" in {
+ }
+
+ it should "detect multiple routes" in {
+ for (a <- ConfigurationFixture.applications)
+ Used.checkMultiPaths(transactionsBySW(a).map(transactionsByName)) shouldBe empty
+ }
+
+ it should "detect impossible service accesses " in {
+ for (a <- Set(appSmart1,appSmart21,appSmart22))
+ Used.checkImpossible(transactionsBySW(a).map(transactionsByName), a.targetService, Some(a)) shouldBe empty
+ Used.checkImpossible(transactionsBySW(dmaDescriptor).map(transactionsByName), dmaDescriptor.targetService, Some(dmaDescriptor)).size shouldBe 1
+ }
+
+ ConfigurationFixture.exportRestrictedHWAndSWGraph()
+
+
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/configuration/TransactionLibraryTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/configuration/TransactionLibraryTest.scala
new file mode 100644
index 0000000..5c86181
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/configuration/TransactionLibraryTest.scala
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.configuration
+
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
+
+class TransactionLibraryTest extends AnyFlatSpec with ScalaCheckPropertyChecks with should.Matchers {
+
+ "A transaction library" should "detect physical transaction with multiple names" in {
+
+ }
+
+ it should "detect the physical transaction without names" in {
+
+ }
+
+ it should "detect impossible user transaction" in {
+
+ }
+
+ it should "encode properly the relation between user and physical transactions" in {
+
+ }
+
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/hardware/PlatformTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/PlatformTest.scala
new file mode 100644
index 0000000..49b3ed7
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/PlatformTest.scala
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.hardware
+
+import onera.pmlanalyzer.pml.model.service.*
+import onera.pmlanalyzer.pml.model.software.*
+import onera.pmlanalyzer.pml.model.hardware.*
+import onera.pmlanalyzer.pml.operators._
+import org.scalacheck.Gen
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
+
+import scala.reflect.*
+
+class PlatformTest extends AnyFlatSpec with ScalaCheckPropertyChecks with should.Matchers {
+
+ override implicit val generatorDrivenConfig: PropertyCheckConfiguration =
+ PropertyCheckConfiguration(minSuccessful = 200)
+
+ object PlatformFixture extends Platform(Symbol("fixture"))
+ with ApplicationTest
+ with LoadTest
+ with StoreTest
+ with TargetTest
+ with SimpleTransporterTest
+ with SmartTest
+
+ import PlatformFixture.*
+
+ private def testBasics[T <: Hardware : Typeable](x: T, loads: List[Load], stores: List[Store]) = {
+ if (loads.nonEmpty)
+ x.loads shouldBe loads.toSet
+ else
+ x.loads shouldBe Set(Load(Symbol(s"${x}_load")))
+ if (stores.nonEmpty)
+ x.stores shouldBe stores.toSet
+ else
+ x.stores shouldBe Set(Store(Symbol(s"${x}_store")))
+ }
+
+ "A platform" should "contains all applications" in {
+ forAll {
+ (x: Application) => assert(Application.all.contains(x))
+ }
+ }
+
+ it should "retrieve composite properly" in {
+ forAll ("name") {
+ (name:Symbol) => whenever(Composite.all.forall(_.name!=name)){
+ val CompositeTest = new Composite(name) {}
+ //redundant ownership test but enforce object initialization
+ CompositeTest.owner shouldBe currentOwner
+ assert(Composite.all.contains(CompositeTest))
+ }
+ }
+ }
+
+ it should "retrieve smart services properly" in {
+ forAll ("name","stores", "loads") {
+ (name: Symbol, stores: List[Store], loads: List[Load]) => {
+ whenever(Initiator.all.forall(_.name != Initiator.formatName(name, currentOwner))) {
+ val smart = Initiator(name, (loads ++ stores).toSet)
+ testBasics(smart, loads, stores)
+ Initiator.all should contain(smart)
+ }
+ }
+ }
+ }
+
+ it should "retrieve target services properly" in {
+ forAll ("name","stores", "loads") {
+ (name: Symbol, stores: List[Store], loads: List[Load]) => {
+ whenever(Target.all.forall(_.name != Target.formatName(name,currentOwner))) {
+ val target = Target(name, (loads ++ stores).toSet)
+ testBasics(target, loads, stores)
+ Target.all should contain(target)
+ }
+ }
+ }
+ }
+
+ it should "retrieve simple transporter services properly" in {
+ forAll ("name","stores", "loads") {
+ (name: Symbol, stores: List[Store], loads: List[Load]) => {
+ whenever(SimpleTransporter.all.forall(_.name != SimpleTransporter.formatName(name,currentOwner))) {
+ val transporter = SimpleTransporter(name, (loads ++ stores).toSet)
+ testBasics(transporter, loads, stores)
+ SimpleTransporter.all should contain(transporter)
+ }
+ }
+ }
+ }
+
+ it should "retrieve virtualizer services properly" in {
+ forAll ("name","stores", "loads") {
+ (name: Symbol, stores: List[Store], loads: List[Load]) => {
+ whenever(Virtualizer.all.forall(_.name != Virtualizer.formatName(name,currentOwner))) {
+ val virtualizer = Virtualizer(name, (loads ++ stores).toSet)
+ testBasics(virtualizer, loads, stores)
+ Virtualizer.all should contain(virtualizer)
+ }
+ }
+ }
+ }
+
+ it should "encode links and unlink properly" in {
+ forAll((Gen.oneOf(Initiator.all), "smart"), (Gen.oneOf(Target.all), "target"), (Gen.oneOf(SimpleTransporter.all), "transporter")) {
+ (smart, target, transporter) => {
+ smart link transporter
+ transporter link target
+ for (ss <- smart.stores) assert(transporter.stores.subsetOf(ss.linked))
+ for (ss <- smart.loads) assert(transporter.loads.subsetOf(ss.linked))
+ for (ss <- transporter.stores) assert(target.stores.subsetOf(ss.linked))
+ for (ss <- transporter.loads) assert(target.loads.subsetOf(ss.linked))
+ smart unlink transporter
+ for (ss <- smart.stores) ss.linked.intersect(transporter.stores) shouldBe empty
+ for (ss <- smart.loads) ss.linked.intersect(transporter.loads) shouldBe empty
+ transporter unlink target
+ for(ss <- transporter.stores) ss.linked.intersect(target.stores) shouldBe empty
+ for(ss <- transporter.loads) ss.linked.intersect(target.loads) shouldBe empty
+ }
+ }
+ }
+
+ it should "encode deactivation properly" in {
+ forAll((Gen.oneOf(Initiator.all), "smart"), (Gen.oneOf(Target.all), "target"), (Gen.oneOf(SimpleTransporter.all), "transporter")) {
+ (smart, target, transporter) => {
+ smart.deactivated
+ smart.services shouldBe empty
+ transporter.deactivated
+ transporter.services shouldBe empty
+ target.deactivated
+ target.services shouldBe empty
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/hardware/SimpleTransporterTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/SimpleTransporterTest.scala
new file mode 100644
index 0000000..283b1d3
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/SimpleTransporterTest.scala
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.hardware
+
+import onera.pmlanalyzer.pml.model.service.{LoadTest, StoreTest}
+import org.scalacheck.{Arbitrary, Gen}
+
+trait SimpleTransporterTest {
+ self:Platform with LoadTest with StoreTest =>
+
+ implicit val genSimpleTransporter:Arbitrary[SimpleTransporter] = Arbitrary(
+ for{
+ name <- Gen.identifier
+ loads <- Gen.listOfN(3,genLoad.arbitrary).suchThat(_.nonEmpty)
+ stores <- Gen.listOfN(3,genStore.arbitrary).suchThat(_.nonEmpty)
+ } yield SimpleTransporter(name,(loads ++ stores).toSet)
+ )
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/hardware/SmartTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/SmartTest.scala
new file mode 100644
index 0000000..d8bac6b
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/SmartTest.scala
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.hardware
+
+import onera.pmlanalyzer.pml.model.service.{LoadTest, StoreTest}
+import org.scalacheck.{Arbitrary, Gen}
+
+trait SmartTest {
+ self:Platform with LoadTest with StoreTest =>
+
+ implicit val genSmart: Arbitrary[Initiator] = Arbitrary(
+ for {
+ name <- Gen.identifier
+ loads <- Gen.listOfN(3, genLoad.arbitrary).suchThat(_.nonEmpty)
+ stores <- Gen.listOfN(3, genStore.arbitrary).suchThat(_.nonEmpty)
+ } yield Initiator(name, (loads ++ stores).toSet)
+ )
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/hardware/TargetTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/TargetTest.scala
new file mode 100644
index 0000000..60f31a9
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/TargetTest.scala
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.hardware
+
+import onera.pmlanalyzer.pml.model.service.{LoadTest, StoreTest}
+import org.scalacheck.{Arbitrary, Gen}
+
+trait TargetTest {
+ self:Platform with LoadTest with StoreTest=>
+
+ implicit val genTarget:Arbitrary[Target] = Arbitrary(
+ for {
+ name <- Gen.identifier
+ loads <- Gen.listOfN(3,genLoad.arbitrary).suchThat(_.nonEmpty)
+ stores <- Gen.listOfN(3,genStore.arbitrary).suchThat(_.nonEmpty)
+ } yield Target(name,(loads ++ stores).toSet)
+ )
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/hardware/VirtualizerTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/VirtualizerTest.scala
new file mode 100644
index 0000000..c83d760
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/hardware/VirtualizerTest.scala
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.hardware
+
+import onera.pmlanalyzer.pml.model.service.{LoadTest, StoreTest}
+import org.scalacheck.{Arbitrary, Gen}
+
+trait VirtualizerTest {
+ self:Platform with LoadTest with StoreTest =>
+
+ implicit val genVirtualizer: Arbitrary[Virtualizer] = Arbitrary(
+ for{
+ name <- Gen.identifier
+ loads <- Gen.listOfN(3,genLoad.arbitrary).suchThat(_.nonEmpty)
+ stores <- Gen.listOfN(3,genStore.arbitrary).suchThat(_.nonEmpty)
+ } yield Virtualizer(name, (loads ++ stores).toSet)
+ )
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/service/ArtificialServiceTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/service/ArtificialServiceTest.scala
new file mode 100644
index 0000000..fd507de
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/service/ArtificialServiceTest.scala
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.service
+
+import org.scalacheck.{Arbitrary, Gen}
+import onera.pmlanalyzer.pml.model.hardware.Platform
+
+trait ArtificialServiceTest {
+ self:Platform =>
+
+ val genArtificialService: Arbitrary[ArtificialService] = Arbitrary(for {
+ name <- Gen.identifier
+ } yield ArtificialService(name))
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/service/LoadTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/service/LoadTest.scala
new file mode 100644
index 0000000..f9e3653
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/service/LoadTest.scala
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.service
+
+import org.scalacheck.{Arbitrary, Gen}
+import onera.pmlanalyzer.pml.model.hardware.Platform
+
+trait LoadTest {
+ self:Platform =>
+
+ implicit val genLoad: Arbitrary[Load] = Arbitrary(for {
+ name <- Gen.identifier
+ } yield Load(name))
+
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/service/StoreTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/service/StoreTest.scala
new file mode 100644
index 0000000..1766e3d
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/service/StoreTest.scala
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.service
+
+import org.scalacheck.{Arbitrary, Gen}
+import onera.pmlanalyzer.pml.model.hardware.Platform
+trait StoreTest {
+ self: Platform =>
+
+ implicit val genStore: Arbitrary[Store] = Arbitrary(
+ for {
+ name <- Gen.identifier
+ } yield Store(name)
+ )
+
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/software/ApplicationTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/software/ApplicationTest.scala
new file mode 100644
index 0000000..1a7e10a
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/software/ApplicationTest.scala
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.software
+
+import org.scalacheck.{Arbitrary, Gen}
+import onera.pmlanalyzer.pml.model.hardware.Platform
+
+trait ApplicationTest {
+ self: Platform =>
+ implicit val genApplication: Arbitrary[Application] = Arbitrary(for {
+ name <- Gen.identifier
+ } yield Application(name)
+ )
+}
+
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/software/DataTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/software/DataTest.scala
new file mode 100644
index 0000000..a79dacf
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/software/DataTest.scala
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.software
+
+import org.scalacheck.{Arbitrary, Gen}
+import onera.pmlanalyzer.pml.model.hardware.Platform
+
+trait DataTest {
+ self:Platform =>
+
+ implicit val genData:Arbitrary[Data] = Arbitrary(
+ for{
+ name <- Gen.identifier
+ } yield Data(name)
+ )
+}
diff --git a/src/test/scala/onera/pmlanalyzer/pml/model/utils/OwnerTest.scala b/src/test/scala/onera/pmlanalyzer/pml/model/utils/OwnerTest.scala
new file mode 100644
index 0000000..4b76d37
--- /dev/null
+++ b/src/test/scala/onera/pmlanalyzer/pml/model/utils/OwnerTest.scala
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2023. ONERA
+ * This file is part of PML Analyzer
+ *
+ * PML Analyzer is free software ;
+ * you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation ;
+ * either version 2 of the License, or (at your option) any later version.
+ *
+ * PML Analyzer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY ;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this program ;
+ * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ******************************************************************************/
+
+package onera.pmlanalyzer.pml.model.utils
+
+import org.scalacheck.{Arbitrary, Gen}
+
+trait OwnerTest {
+
+ implicit val genOwner: Arbitrary[Owner] = Arbitrary(for {
+ name <- Gen.identifier
+ } yield Owner(Symbol(name)))
+
+}