ReForma 0.225__tar.gz → 0.295__tar.gz

{reforma-0.225 → reforma-0.295}/PKG-INFO

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

{reforma-0.225 → reforma-0.295}/ReForma.egg-info/PKG-INFO

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

{reforma-0.225 → reforma-0.295}/pyproject.toml

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

{reforma-0.225 → reforma-0.295}/reforma/client.py

@@ -869,17 +869,29 @@ class ReForma:
         enabled: list[Transition] = []
         variables: dict[str, int] = {}
 
+        import re
+        
         for line in lines:
             if line.startswith("Estado Atual:"):
-                parts = line.split(":", 1)[1].strip()
-                current_states = [s.strip() for s in parts.split(",")]
+                st_parts = line.split(":", 1)[1].strip()
+                current_states = [s.strip() for s in st_parts.split(",")]
             
             elif line.startswith("Variaveis:"):
-                parts = line.split(":", 1)[1].strip()
-                for kv in parts.split(","):
-                    if "=" in kv:
-                        k, v = kv.split("=", 1)
-                        variables[k.strip()] = int(v.strip())
+                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)
+                
+                for m in matches:
+                    k = m.group(1)
+                    val_str = m.group(2) or m.group(3) or m.group(4) or m.group(5)
+                    if val_str:
+                        val_str = val_str.strip()
+                        try:
+                            variables[k] = int(val_str)
+                        except ValueError:
+                            try:
+                                variables[k] = float(val_str)
+                            except ValueError:
+                                variables[k] = val_str
 
             m = re.match(
                 r"\s*-\s*\[(.+?)\]\s+de\s+(\S+)\s+para\s+(\S+)\s+\(P=([\d.,]+)\)",
@@ -901,7 +913,6 @@ class ReForma:
             raw={},
         )
 
-
 def _get_local_js(filename: str) -> str:
     """Reads the local JS file to be injected into HTML."""
     base_dir = os.path.dirname(__file__)

{reforma-0.225 → reforma-0.295}/reforma/jar_bridge.py

@@ -99,13 +99,15 @@ class JarBridge:
         Run:  java -jar <jar> <args...>
         Returns stdout.  Raises JarError on non-zero exit.
         """
-        cmd = [self.java_bin, "-jar", self.jar_path, *args]
+        # Forçamos o Java a usar UTF-8 no Windows
+        cmd = [self.java_bin, "-Dfile.encoding=UTF-8", "-jar", self.jar_path, *args]
         result = subprocess.run(
             cmd,
             input=stdin_data,
             capture_output=True,
             text=True,
             encoding="utf-8",
+            errors="replace"
         )
         if result.returncode != 0:
             raise JarError(
@@ -179,12 +181,13 @@ class JarBridge:
         Reads and returns the content of this output file.
         JAR progress/logs go to stderr — ignored here.
         """
-        cmd = [self.java_bin, "-jar", self.jar_path, *args]
+        cmd = [self.java_bin, "-Dfile.encoding=UTF-8", "-jar", self.jar_path, *args]
         result = subprocess.run(
             cmd,
             capture_output=True,
             text=True,
             encoding="utf-8",
+            errors="replace"
         )
         if result.returncode != 0:
             raise JarError(
@@ -196,7 +199,7 @@ class JarBridge:
                 f"JAR did not generate the expected output file: {out_path}\n"
                 f"stderr: {result.stderr.strip()}"
             )
-        with open(out_path, "r", encoding="utf-8") as f:
+        with open(out_path, "r", encoding="utf-8", errors="replace") as f:
             return f.read()
 
     def merge_models(self, sourceA: str, sourceB: str, op_type: str, agg: str) -> str: