Add SemanticsExporter to easily access Semantics info

src/main/scala/onera/pmlanalyzer/pml/examples/mySys/MySysExport.scala

@@ -20,8 +20,8 @@ package onera.pmlanalyzer.pml.examples.mySys
 import onera.pmlanalyzer.pml.exporters.*
 import onera.pmlanalyzer.pml.model.utils.Message
 import onera.pmlanalyzer.pml.operators.*
-import onera.pmlanalyzer.views.interference.examples.mySys.{MySysApplicativeTableBasedInterferenceSpecification, MySysPhysicalTableBasedInterferenceSpecification}
-
+import onera.pmlanalyzer.views.interference.examples.mySys.{MySysInterferenceSpecification, MyProcInterferenceSpecification}
+import onera.pmlanalyzer.views.interference.exporters.*
 /**
  * Program entry point to export several version of Keystone
  */
@@ -35,8 +35,8 @@ object MySysExport extends App {
   object MySys extends MyProcPlatform
     with MySysLibraryConfiguration
     with MyProcRoutingConfiguration
-    with MySysPhysicalTableBasedInterferenceSpecification
-    with MySysApplicativeTableBasedInterferenceSpecification
+    with MyProcInterferenceSpecification
+    with MySysInterferenceSpecification
 
   // Export only HW used by SW (explicit)
   MySys.exportRestrictedHWAndSWGraph()
@@ -64,4 +64,5 @@ object MySysExport extends App {
   // Export the transactions defined by the user
   MySys.exportUserScenarios()
 
+  MySys.exportSemanticsSize()
 }

src/main/scala/onera/pmlanalyzer/views/interference/examples/mySys/MySysPhysicalTableBasedInterferenceSpecification.scala → src/main/scala/onera/pmlanalyzer/views/interference/examples/mySys/MyProcInterferenceSpecification.scala

@@ -43,7 +43,7 @@ import onera.pmlanalyzer.views.interference.operators.*
   *  }
   * }}}
   */
-trait MySysPhysicalTableBasedInterferenceSpecification extends PhysicalTableBasedInterferenceSpecification {
+trait MyProcInterferenceSpecification extends PhysicalTableBasedInterferenceSpecification {
   self: MyProcPlatform =>
 
   //Encoding of Rule 1 and Rule 2

src/main/scala/onera/pmlanalyzer/views/interference/examples/mySys/MySysInterferenceGeneration.scala

@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * 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.views.interference.examples.mySys
+
+import onera.pmlanalyzer.pml.examples.mySys.MySysExport.*
+import onera.pmlanalyzer.views.interference.operators.*
+
+import scala.concurrent.duration.*
+import scala.language.postfixOps
+
+/**
+  * Compute the interference of the SimpleKeystone defined in [[pml.examples.mySys.MySysExport]]
+  */
+object MySysInterferenceGeneration extends App {
+    // Compute only up to 2-ite and 2-free
+    MySys.computeKInterference(2, 2 hours)
+
+    // Compute all ite and itf for benchmarks
+    MySys.computeAllInterference( 2 hours, ignoreExistingAnalysisFiles = true)
+}

src/main/scala/onera/pmlanalyzer/views/interference/examples/mySys/MySysApplicativeTableBasedInterferenceSpecification.scala → src/main/scala/onera/pmlanalyzer/views/interference/examples/mySys/MySysInterferenceSpecification.scala

@@ -30,7 +30,7 @@ import onera.pmlanalyzer.views.interference.operators.*
   * {{{app3 notInterfereWith TeraNet.periph_bus.loads}}}
   * @see [[views.interference.operators.Exclusive.Ops]] for interfere operator definition
   */
-trait MySysApplicativeTableBasedInterferenceSpecification extends ApplicativeTableBasedInterferenceSpecification {
+trait MySysInterferenceSpecification extends ApplicativeTableBasedInterferenceSpecification {
   self: MyProcPlatform with MySysTransactionLibrary with MySysLibraryConfiguration with MySysSoftwareAllocation   =>
 
   app22 exclusiveWith app3

src/main/scala/onera/pmlanalyzer/views/interference/examples/mySys/package.scala

@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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.views.interference.examples
+
+/**
+ *  Package containing an example on a simplification of a TI Keystone platform
+ *  @see [[MyProcPhysicalTableBasedInterferenceSpecification]] provides an example of hardware interference assumption modelling
+ *  @see [[MySysInterferenceSpecification]] provides an example of application interference assumption modelling
+ *  @see [[MySysInterferenceGeneration]] provides an example of interference analysis for the simplified
+ *       Keystone platform
+ */
+package object mySys

src/main/scala/onera/pmlanalyzer/views/interference/exporters/InterferenceGraphExporter.scala

@@ -21,17 +21,17 @@ 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 onera.pmlanalyzer.views.interference.model.specification.InterferenceSpecification.{PhysicalScenarioId, multiTransactionId}
 
 import java.io.FileWriter
 
 object InterferenceGraphExporter {
   trait Ops {
     implicit class InterferenceGraphExporterOps(x: Platform with InterferenceSpecification) extends UMLExporter.Ops {
       def exportGraph(it: Set[PhysicalScenarioId]): Unit = {
-        val scenarioSetName = scenarioSetId(it.map(x => PhysicalScenarioId(x.id)))
+        val multiTransactionName = multiTransactionId(it.map(x => PhysicalScenarioId(x.id)))
         implicit val writer: FileWriter = new FileWriter(FileManager.exportDirectory.getFile(
-          s"${x.fullName}_${if(scenarioSetName.id.name.length >= 100) scenarioSetName.hashCode.toString else scenarioSetName}.dot"
+          s"${x.fullName}_${if(multiTransactionName.id.name.length >= 100) multiTransactionName.hashCode.toString else multiTransactionName}.dot"
         ))
         DOTServiceOnly.resetService()
         DOTServiceOnly.writeHeader

src/main/scala/onera/pmlanalyzer/views/interference/exporters/SemanticsExporter.scala

@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * 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.views.interference.exporters
+
+import onera.pmlanalyzer.pml.model.hardware.{Hardware, Platform}
+import onera.pmlanalyzer.pml.operators.Provided
+import onera.pmlanalyzer.views.interference.operators.*
+import onera.pmlanalyzer.pml.exporters.FileManager
+
+import java.io.{File, FileWriter}
+
+object SemanticsExporter {
+  trait Ops {
+    extension[T<: Platform](self:T) {
+      def exportSemanticsSize()(using ev: Analyse[T],p:Provided[T,Hardware]): File  = {
+        val file = FileManager.exportDirectory.getFile(self.fullName + "SemanticsSize.txt")
+        val writer = new FileWriter(file)
+        val semantics = self.getSemanticsSize
+        writer.write("Multi-transaction cardinal, Number\n")
+        for( (i,n) <- semantics)
+          writer.write(s"$i, $n\n")
+        writer.close()
+        file
+      }
+    }
+  }
+
+}

src/main/scala/onera/pmlanalyzer/views/interference/exporters/package.scala

@@ -27,4 +27,5 @@ package onera.pmlanalyzer.views.interference
   * Example of usages are provided in ???
   */
 package object exporters extends IDPExporter.Ops
-  with InterferenceGraphExporter.Ops
+  with InterferenceGraphExporter.Ops 
+  with SemanticsExporter.Ops

src/main/scala/onera/pmlanalyzer/views/interference/model/specification/InterferenceSpecification.scala

@@ -148,7 +148,7 @@ trait InterferenceSpecification
     * @param t the identifier of the transaction
     * @return the path of the transaction
     */
-  final def purify(t: PhysicalTransactionId): PhysicalTransaction = transactionsByName.get(t) match {
+  private final def purify(t: PhysicalTransactionId): PhysicalTransaction = transactionsByName.get(t) match {
     case Some(h :: tail) =>
       (h +: (transactionInterfereWith(t).toList.sortBy(_.name.name) ++ tail)).filterNot(transactionNotInterfereWith(t))
     case _ => Nil
@@ -337,18 +337,18 @@ object InterferenceSpecification {
 
   case class PhysicalScenarioId(id: Symbol) extends Id
 
-  case class PhysicalScenarioSetId(id: Symbol) extends Id
+  case class PhysicalMultiTransactionId(id: Symbol) extends Id
 
   case class ChannelId(id: Symbol) extends Id
 
-  def scenarioSetId(t: Iterable[PhysicalScenarioId]): PhysicalScenarioSetId =
-    PhysicalScenarioSetId(Symbol(t.map(_.id.name).toArray.sorted.mkString("< ", " || ", " >")))
+  def multiTransactionId(t: Iterable[PhysicalScenarioId]): PhysicalMultiTransactionId =
+    PhysicalMultiTransactionId(Symbol(t.map(_.id.name).toArray.sorted.mkString("< ", " || ", " >")))
 
   def channelId(t: Set[Service]): ChannelId =
     ChannelId(Symbol(t.map(_.toString).toArray.sorted.mkString("{ ", ", ", " }")))
 
-  def groupedScenarioLitId(s: Set[PhysicalScenarioId]): PhysicalScenarioSetId =
-    PhysicalScenarioSetId(Symbol(scenarioSetId(s).id.name.replace(" ", "")))
+  def groupedScenarioLitId(s: Set[PhysicalScenarioId]): PhysicalMultiTransactionId =
+    PhysicalMultiTransactionId(Symbol(multiTransactionId(s).id.name.replace(" ", "")))
 
 
   trait Default extends InterferenceSpecification {