ReForma 0.29__tar.gz → 0.30__tar.gz

{reforma-0.29 → reforma-0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ReForma
-Version: 0.29
+Version: 0.30
 Summary: Python bindings for the RePA/ReForma probabilistic automaton tool
 Author-email: Joshua Dourado <joshuadourado@ua.pt>
 License: MIT

{reforma-0.29 → reforma-0.30}/ReForma.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ReForma
-Version: 0.29
+Version: 0.30
 Summary: Python bindings for the RePA/ReForma probabilistic automaton tool
 Author-email: Joshua Dourado <joshuadourado@ua.pt>
 License: MIT

{reforma-0.29 → reforma-0.30}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ReForma"
-version = "0.29"
+version = "0.30"
 description = "Python bindings for the RePA/ReForma probabilistic automaton tool"
 readme = "README.md"
 requires-python = ">=3.10"

{reforma-0.29 → reforma-0.30}/reforma/client.py

@@ -360,8 +360,10 @@ class ReForma:
         raw = self._bridge.list_transitions(self._model.source, self._history)
         next_state = self._parse_simulation(raw)
 
+        resolved_states = next_state.current_states if next_state.current_states else self._state.current_states
+
         self._state = SimulationState(
-            current_states=next_state.current_states,
+            current_states=resolved_states,
             enabled=next_state.enabled,
             variables=next_state.variables,
             can_undo=len(self._history) > 0,
@@ -872,11 +874,11 @@ class ReForma:
         import re
         
         for line in lines:
-            if line.startswith("Estado Atual:"):
+            if line.startswith("Estado Atual:") or line.startswith("Current State:"):
                 st_parts = line.split(":", 1)[1].strip()
                 current_states = [s.strip() for s in st_parts.split(",")]
             
-            elif line.startswith("Variaveis:"):
+            elif line.startswith("Variaveis:") or line.startswith("Variables:"):
                 var_parts = line.split(":", 1)[1].strip()
                 matches = re.finditer(r"([a-zA-Z0-9_]+)\s*=\s*(?:VInt\(\s*([^,)]+)|VFloat\(\s*([^,)]+)|VBool\(\s*([^,)]+)|([^,]+))", var_parts)
                 
@@ -894,7 +896,7 @@ class ReForma:
                                 variables[k] = val_str
 
             m = re.match(
-                r"\s*-\s*\[(.+?)\]\s+de\s+(\S+)\s+para\s+(\S+)\s+\(P=([\d.,]+)\)",
+                r"\s*-\s*\[(.+?)\]\s+(?:de|from)\s+(\S+)\s+(?:para|to)\s+(\S+)\s+\(P=([\d.,]+)\)",
                 line,
             )
             if m: