IGJSP 1.1.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

IGJSP/generador.py

@@ -26,6 +26,42 @@ def t(c):
     return 4.0704 * np.log(2) / np.log(1 + (c* 2.5093)**3)
 
 
+# ------- Helpers internos para el DZN -------
+
+def _parse_int_var(text, name, default=None):
+    """
+    Busca una variable escalar tipo: name = 10;
+    """
+    m = re.search(rf'\b{name}\b\s*=\s*([0-9]+)', text)
+    if m:
+        return int(m.group(1))
+    if default is not None:
+        return default
+    raise ValueError(f"No se encontró la variable entera '{name}' en el fichero DZN.")
+
+
+def _parse_array_var(text, name):
+    """
+    Busca una variable array tipo:
+        name = [1, 2, 3];
+    o
+        name = [1 2 3];
+    Devuelve un np.array de ints o None si no está.
+    """
+    m = re.search(rf'\b{name}\b\s*=.*?\[(.*?)\];', text, re.DOTALL)
+    if not m:
+        return None
+
+    inner = m.group(1).strip()
+    if not inner:
+        return np.array([], dtype=int)
+
+    # Separar por comas o espacios
+    tokens = re.split(r'[\s,]+', inner)
+    tokens = [t for t in tokens if t != '']
+
+    return np.array([int(t) for t in tokens], dtype=int)
+
 #################################################################################
 #                                                                               # 
 #                                    JSP                                       # 

{igjsp-1.1.0.dist-info → igjsp-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IGJSP
-Version: 1.1.0
+Version: 1.1.1
 Summary: Instance generator for JSP
 Project-URL: Homepage, https://gps.blogs.upv.es/
 Author-email: GPS-UPV <gps@dsic.upv.es>

{igjsp-1.1.0.dist-info → igjsp-1.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-IGJSP/generador.py,sha256=nSPgsVbpR5YydbrkIOhkGmXbFCnkaIAkRu-ok-_BJpY,47603
+IGJSP/generador.py,sha256=vpopW1e8zwZ5H69uvCSY28KJuP-XGNM6VQPKCTawiAs,48598
 IGJSP/main.py,sha256=Sia5Ss8O3HWBdshvPLJKUMaZIoQPHy6x8yzvojojPFo,2838
 IGJSP/Minizinc/Models/RD/JSP0.mzn,sha256=cfN_E3RQ6nBulGfaOOYTd-zAgA5SI6E2saDlYtKCflg,2282
 IGJSP/Minizinc/Models/RD/JSP1.mzn,sha256=5B8cyw2WyKR8yEL1fFd0TaCAVhjPoxEJRJDPPEjJGEk,2840
@@ -12,7 +12,7 @@ IGJSP/Minizinc/Types/RD/FJSP/type2.dzn,sha256=Wz1MnkSL5GUPsbh1eq0leoaQRImkNqQqkX
 IGJSP/Minizinc/Types/RD/JSP/type0.dzn,sha256=wNuPQkXBXPSpPaPz2WFhp4pGDgfSimtg4I93UfwC01Q,263
 IGJSP/Minizinc/Types/RD/JSP/type1.dzn,sha256=Xbt9StzCgEqqh_HS9tWGrTVtu-OEnf5Yq5Ty91AkzoM,333
 IGJSP/Minizinc/Types/RD/JSP/type2.dzn,sha256=L2nc7bPJEhyuaEwgw0ZCpC52CpVJILQU_WQdKn8GUZs,379
-igjsp-1.1.0.dist-info/METADATA,sha256=q-mdPgQhQCvXKTtYbNMsDzgvR-oov4pe27Js_9Oeazo,10609
-igjsp-1.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-igjsp-1.1.0.dist-info/licenses/LICENSE,sha256=f7RDRO-z_nMoooAya7NAb8sXtrHR6WnttYtyUc9fB-c,1116
-igjsp-1.1.0.dist-info/RECORD,,
+igjsp-1.1.1.dist-info/METADATA,sha256=JtfzaTnLrHW2GMG__daue2UjaEjh9_0UwgDMFDjVCRI,10609
+igjsp-1.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+igjsp-1.1.1.dist-info/licenses/LICENSE,sha256=f7RDRO-z_nMoooAya7NAb8sXtrHR6WnttYtyUc9fB-c,1116
+igjsp-1.1.1.dist-info/RECORD,,