From c54497b8cde8aa453129789489d1141fd2bea13c Mon Sep 17 00:00:00 2001
From: Leonardo Montecchi <leonardo.montecchi@ntnu.no>
Date: Tue, 26 Nov 2024 09:56:52 +0100
Subject: [PATCH] Updating StateMachine file examples that caused problems in
the transformation
---
sm/no.ntnu.tdt4250.sm.examples/Oven.sm | 67 ++++++++++++++++++++------
sm/no.ntnu.tdt4250.sm/ExampleSM.sm | 1 +
2 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/sm/no.ntnu.tdt4250.sm.examples/Oven.sm b/sm/no.ntnu.tdt4250.sm.examples/Oven.sm
index b22feb5..7084686 100644
--- a/sm/no.ntnu.tdt4250.sm.examples/Oven.sm
+++ b/sm/no.ntnu.tdt4250.sm.examples/Oven.sm
@@ -1,22 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sm:StateMachine xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:sm="http://www.ntnu.no/idi/tdt4250/2023/sm" name="PowerOven" initial="//@state.0" final="//@state.4 //@state.2 //@state.1/@children.1/@children.0">
- <state name="Off" outgoing="//@transition.0 //@transition.6" incoming="//@transition.2 //@transition.4 //@transition.6"/>
- <state name="MidPower" outgoing="//@transition.1 //@transition.2 //@transition.5" incoming="//@transition.0 //@transition.3">
- <children name="Power300w"/>
- <children name="Power600w">
- <children/>
- </children>
+<sm:StateMachine
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:sm="http://www.ntnu.no/idi/tdt4250/2023/sm"
+ name="PowerOven"
+ initial="//@state.0"
+ final="//@state.4 //@state.2">
+ <state name="Off"
+ outgoing="//@transition.0 //@transition.6"
+ incoming="//@transition.2 //@transition.4 //@transition.6"/>
+ <state name="MidPower"
+ outgoing="//@transition.1 //@transition.2 //@transition.5"
+ incoming="//@transition.0 //@transition.3">
+ <children
+ name="Power300w"/>
+ <children
+ name="Power600w"/>
</state>
- <state name="FullPower" outgoing="//@transition.3" incoming="//@transition.1"/>
- <state name="Overheat" outgoing="//@transition.4" incoming="//@transition.5"/>
+ <state name="FullPower"
+ outgoing="//@transition.3"
+ incoming="//@transition.1"/>
+ <state name="Overheat"
+ outgoing="//@transition.4"
+ incoming="//@transition.5"/>
<state name="Exploded"/>
<state name="ThisIsANewState"/>
<state name="Turbo"/>
- <transition name="PowerOn" source="//@state.0" target="//@state.1"/>
- <transition name="IncreasePw" source="//@state.1" target="//@state.2"/>
- <transition name="PowerOff" source="//@state.1" target="//@state.0"/>
- <transition name="ReducePw" source="//@state.2" target="//@state.1"/>
- <transition name="SafetyTrigger" source="//@state.3" target="//@state.0"/>
- <transition name="Overheating" source="//@state.1" target="//@state.3"/>
- <transition name="Repair" source="//@state.0" target="//@state.0"/>
+ <transition
+ name="PowerOn"
+ source="//@state.0"
+ target="//@state.1"/>
+ <transition
+ name="IncreasePw"
+ source="//@state.1"
+ target="//@state.2"/>
+ <transition
+ name="PowerOff"
+ source="//@state.1"
+ target="//@state.0"/>
+ <transition
+ name="ReducePw"
+ source="//@state.2"
+ target="//@state.1"/>
+ <transition
+ name="SafetyTrigger"
+ source="//@state.3"
+ target="//@state.0"/>
+ <transition
+ name="Overheating"
+ source="//@state.1"
+ target="//@state.3"/>
+ <transition
+ name="Repair"
+ source="//@state.0"
+ target="//@state.0"/>
</sm:StateMachine>
diff --git a/sm/no.ntnu.tdt4250.sm/ExampleSM.sm b/sm/no.ntnu.tdt4250.sm/ExampleSM.sm
index 7c7e3ca..514ce89 100644
--- a/sm/no.ntnu.tdt4250.sm/ExampleSM.sm
+++ b/sm/no.ntnu.tdt4250.sm/ExampleSM.sm
@@ -4,6 +4,7 @@
xmlns:xmi="http://www.omg.org/XMI"
xmlns:sm="http://www.ntnu.no/idi/tdt4250/2023/sm"
name="TR1"
+ initial="//@state.0"
final="//@state.1">
<state name="s1"
outgoing="//@transition.0"/>
--
GitLab