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

IGJSP/generador.py

@@ -15,6 +15,15 @@ from pprint import pprint
 
 from scipy.stats import expon, norm, uniform
 
+from importlib.resources import files, as_file
+
+def _read_text_resource(rel_path: str, encoding: str = "utf-8") -> str:
+    p = files("IGJSP").joinpath(rel_path)
+    if not p.is_file():
+        raise FileNotFoundError(
+            f"Template Minizinc no encontrado en el paquete: {rel_path}"
+        )
+    return p.read_text(encoding=encoding)
 
 def f(x):
     return int(np.exp(-int(x)/100)*100)
@@ -28,27 +37,51 @@ def t(c):
 
 # ------- Helpers internos para el DZN -------
 
-def _parse_int_var(text, name, default=None):
+
+def _parse_set_size(text, name):
+    """
+    Obtiene el tamaño de un conjunto tipo:
+        JOBS = 1..50;
+    Devuelve 50.
     """
-    Busca una variable escalar tipo: name = 10;
+    m = re.search(rf'\b{name}\b\s*=\s*1\.\.(\d+)\s*;', text)
+    if not m:
+        raise ValueError(f"No se pudo encontrar el conjunto {name} = 1..N; en el fichero DZN.")
+    return int(m.group(1))
+
+
+def _parse_speed(text):
     """
-    m = re.search(rf'\b{name}\b\s*=\s*([0-9]+)', text)
+    SPEED puede ir como:
+        SPEED = 1;
+    o (por si acaso) como 1..SPEED; (aunque en tu ejemplo es un escalar).
+    """
+    m = re.search(r'\bSPEED\b\s*=\s*(\d+)\s*;', text)
+    if m:
+        return int(m.group(1))
+
+    m = re.search(r'\bSPEED\b\s*=\s*1\.\.(\d+)\s*;', 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.")
+
+    # Si no aparece, asumimos 1 (como en muchos templates tuyos)
+    return 1
 
 
-def _parse_array_var(text, name):
+def _parse_array_from_arrayXd(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á.
+    Extrae la parte entre corchetes de cosas tipo:
+        name = array3d(...,[1,2,3,...]);
+        name = array2d(...,[1,2,3,...]);
+        name = array1d(...,[1,2,3,...]);
+
+    Devuelve np.array de ints o None si no se encuentra.
     """
-    m = re.search(rf'\b{name}\b\s*=.*?\[(.*?)\];', text, re.DOTALL)
+    m = re.search(
+        rf'\b{name}\b\s*=\s*array[123]d\([^[]*\[\s*(.*?)\s*\]\s*\)\s*;',
+        text,
+        re.DOTALL
+    )
     if not m:
         return None
 
@@ -62,6 +95,41 @@ def _parse_array_var(text, name):
 
     return np.array([int(t) for t in tokens], dtype=int)
 
+
+def _parse_array_fallback_plain(text, name):
+    """
+    Fallback para cosas tipo:
+        name = [1,2,3,...];
+    por si en algún template no se usa arrayXd.
+    """
+    m = re.search(
+        rf'\b{name}\b\s*=\s*\[\s*(.*?)\s*\]\s*;',
+        text,
+        re.DOTALL
+    )
+    if not m:
+        return None
+
+    inner = m.group(1).strip()
+    if not inner:
+        return np.array([], dtype=int)
+
+    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)
+
+
+def _parse_array_generic(text, name):
+    """
+    Intenta primero arrayXd(...,[...]); y si no lo encuentra,
+    prueba el formato plano name = [ ... ];
+    """
+    arr = _parse_array_from_arrayXd(text, name)
+    if arr is not None:
+        return arr
+    return _parse_array_fallback_plain(text, name)
+
 #################################################################################
 #                                                                               # 
 #                                    JSP                                       # 
@@ -183,24 +251,46 @@ class JSP:
 
     def loadDznFile(path):
         """
-        Carga un .dzn generado por saveDznFile y devuelve un JSP.
-        Soporta rddd = 0, 1, 2 (sin fechas, fechas por job, fechas por operación).
+        Carga un .dzn generado a partir de tus templates, del estilo:
+
+            JOBS = 1..J;
+            MACHINES = 1..M;
+            SPEED = S;
+
+            time = array3d(JOBS,MACHINES,1..SPEED,[...]);
+            energy = array3d(JOBS,MACHINES,1..SPEED,[...]);
+            precedence = array2d(JOBS,MACHINES,[...]);
+
+        Opcionalmente puede contener:
+            releaseDate = array1d(JOBS,[...])  (rddd = 1)
+            dueDate     = array1d(JOBS,[...])
+
+        o
+
+            releaseDate = array2d(JOBS,MACHINES,[...])  (rddd = 2)
+            dueDate     = array2d(JOBS,MACHINES,[...])
+
+        Devuelve un objeto JSP(**sol) consistente con loadJsonFile.
         """
         with open(path, 'r', encoding='utf-8') as f:
             text = f.read()
 
-        numJobs = _parse_int_var(text, 'jobs')
-        numMchs = _parse_int_var(text, 'machines')
-        speed = _parse_int_var(text, 'Speed', default=1)
+        # Eliminar comentarios de Minizinc (% hasta final de línea)
+        text = re.sub(r'%.*', '', text)
+
+        # Leer tamaños de conjuntos
+        numJobs = _parse_set_size(text, "JOBS")
+        numMchs = _parse_set_size(text, "MACHINES")
+        speed = _parse_speed(text)
 
-        time_flat = _parse_array_var(text, 'time')
-        energy_flat = _parse_array_var(text, 'energy')
-        prec_flat = _parse_array_var(text, 'precedence')
+        # Leer arrays principales
+        time_flat = _parse_array_generic(text, "time")
+        energy_flat = _parse_array_generic(text, "energy")
+        prec_flat = _parse_array_generic(text, "precedence")
 
         if time_flat is None or energy_flat is None or prec_flat is None:
-            raise ValueError("Faltan variables obligatorias (time, energy o precedence) en el fichero DZN.")
+            raise ValueError("No se pudieron leer 'time', 'energy' o 'precedence' del fichero DZN.")
 
-        # Comprobar tamaños
         expected_te = numJobs * numMchs * speed
         if time_flat.size != expected_te or energy_flat.size != expected_te:
             raise ValueError(
@@ -218,29 +308,27 @@ class JSP:
         EnergyConsumption = energy_flat.reshape((numJobs, numMchs, speed))
         precedence = prec_flat.reshape((numJobs, numMchs))
 
-        # Reconstruir Orden a partir de la precedencia (cada fila es posiciones 0..numMchs-1 por máquina)
+        # Reconstruir Orden a partir de precedence (igual que en saveDznFile)
+        # precedence[j, m] = posición de la máquina m en la secuencia 0..M-1
         Orden = np.zeros((numJobs, numMchs), dtype=int)
         for j in range(numJobs):
-            # precedence[j, m] = posición de la máquina m en la secuencia
-            # argsort da el índice de la máquina por orden de prioridad
             Orden[j, :] = np.argsort(precedence[j, :])
 
-        # Release / Due dates (pueden no existir)
-        release_flat = _parse_array_var(text, 'releaseDate')
-        due_flat = _parse_array_var(text, 'dueDate')
+        # --- Release / Due dates (si existen) ---
+        release_flat = _parse_array_generic(text, "releaseDate")
+        due_flat = _parse_array_generic(text, "dueDate")
 
         if release_flat is None or due_flat is None:
-            # rddd = 0
+            # rddd = 0 (no fechas)
             ReleaseDueDate = np.array([])
         else:
-            # O bien vector por job, o matriz jobs x machines
             if release_flat.size == numJobs and due_flat.size == numJobs:
-                # rddd = 1 → (numJobs, 2)
+                # rddd = 1: job-level
                 ReleaseDueDate = np.zeros((numJobs, 2), dtype=int)
                 ReleaseDueDate[:, 0] = release_flat
                 ReleaseDueDate[:, 1] = due_flat
             elif release_flat.size == numJobs * numMchs and due_flat.size == numJobs * numMchs:
-                # rddd = 2 → (numJobs, numMchs, 2)
+                # rddd = 2: operation-level
                 ReleaseDueDate = np.zeros((numJobs, numMchs, 2), dtype=int)
                 ReleaseDueDate[:, :, 0] = release_flat.reshape((numJobs, numMchs))
                 ReleaseDueDate[:, :, 1] = due_flat.reshape((numJobs, numMchs))
@@ -257,6 +345,7 @@ class JSP:
             'ReleaseDateDueDate': ReleaseDueDate,
             'Orden': Orden
         }
+
         return JSP(**sol)
 
     def loadTaillardFile(path):
@@ -548,7 +637,7 @@ class JSP:
         with open(path, 'wb') as f:
             pickle.dump(self, f)
 
-    def saveDznFile(self, InputDir, OutputDir):
+    def saveDznFile(self, InputDir, OutputDir,index):
         indexProblema = OutputDir.split("/")[-2]
         OutputDir = "/".join(OutputDir.split("/")[:-2])
         # indexProblema = os.path.basename(os.path.normpath(OutputDir))
@@ -557,40 +646,41 @@ class JSP:
             # print(self.speed)
             # for t in [0, 1, 2]:
             t = data.rddd
-            for s in range(1,self.speed+1):
-                s0, sf, sp = [0,s,1]
-                time = data.ProcessingTime[:, :, s0:sf:sp]
-                energy = data.EnergyConsumption[:, :, s0:sf:sp]
-                precedence = np.full((data.numJobs, data.numMchs), 0)
-
-                replace_data = {
-                    "machines": data.numMchs,
-                    "jobs": data.numJobs,
-                    "Speed": s,
-                    "time": str(time.flatten()).replace(" ", ", "),
-                    "energy": str(energy.flatten()).replace(" ", ", ")
-                }
-
-                if t == 1:
-                    replace_data["releaseDate"] = str([int(data.ReleaseDueDate[job, 0]) for job in range(data.numJobs)]).replace(", ", " ")
-                    replace_data["dueDate"] = str([int(data.ReleaseDueDate[job, 1]) for job in range(data.numJobs)]).replace(", ", " ")
-                elif t == 2:
-                    replace_data["releaseDate"] = str(data.ReleaseDueDate[:, :, 0].flatten()).replace(", ", " ")
-                    replace_data["dueDate"] = str(data.ReleaseDueDate[:, :, 1].flatten()).replace(", ", " ")
-
-                for job in range(data.numJobs):
-                    for i, prioridad in enumerate(range(data.numMchs)):
-                        precedence[job, data.Orden[job, prioridad]] = i
-
-                replace_data["precedence"] = str(precedence.flatten()).replace(" ", ",")
-
-                with open(f"./Minizinc/Types/RD/JSP/type{t}.dzn", "r", encoding="utf-8") as file:
-                    filedata = file.read()
-                    for k, v in replace_data.items():
-                        filedata = filedata.replace("{" + k + "}", str(v))
-                    os.makedirs(f"{OutputDir}/", exist_ok=True)
-                    with open(f"{OutputDir}/{indexProblema}-{t}-{s}.dzn", "w+", encoding="utf-8") as new:
-                        new.write(filedata)
+            # for s in range(1,self.speed+1):
+            s = self.speed
+            s0, sf, sp = [0,s,1]
+            time = data.ProcessingTime[:, :, s0:sf:sp]
+            energy = data.EnergyConsumption[:, :, s0:sf:sp]
+            precedence = np.full((data.numJobs, data.numMchs), 0)
+
+            replace_data = {
+                "machines": data.numMchs,
+                "jobs": data.numJobs,
+                "Speed": s,
+                "time": str(time.flatten()).replace(" ", ", "),
+                "energy": str(energy.flatten()).replace(" ", ", ")
+            }
+
+            if t == 1:
+                replace_data["releaseDate"] = str([int(data.ReleaseDueDate[job, 0]) for job in range(data.numJobs)]).replace(", ", " ")
+                replace_data["dueDate"] = str([int(data.ReleaseDueDate[job, 1]) for job in range(data.numJobs)]).replace(", ", " ")
+            elif t == 2:
+                replace_data["releaseDate"] = str(data.ReleaseDueDate[:, :, 0].flatten()).replace(", ", " ")
+                replace_data["dueDate"] = str(data.ReleaseDueDate[:, :, 1].flatten()).replace(", ", " ")
+
+            for job in range(data.numJobs):
+                for i, prioridad in enumerate(range(data.numMchs)):
+                    precedence[job, data.Orden[job, prioridad]] = i
+
+            replace_data["precedence"] = str(precedence.flatten()).replace(" ", ",")
+            filedata = _read_text_resource(f"Minizinc/Types/RD/JSP/type{t}.dzn")
+            # with open(f"./Minizinc/Types/RD/JSP/type{t}.dzn", "r", encoding="utf-8") as file:
+                # filedata = file.read()
+            for k, v in replace_data.items():
+                filedata = filedata.replace("{" + k + "}", str(v))
+            os.makedirs(f"{OutputDir}/", exist_ok=True)
+            with open(f"{OutputDir}/{indexProblema}-{t}-{s}_{index}.dzn", "w+", encoding="utf-8") as new:
+                new.write(filedata)
 
     def saveTaillardStandardFile(self, path):
         os.makedirs("/".join(path.split("/")[:-1]),exist_ok=True)
@@ -917,7 +1007,7 @@ class FJSP(JSP):
             
             f.write(json_str)
 
-    def saveDznFile(self, InputDir, OutputDir):
+    def saveDznFile(self, InputDir, OutputDir,index):
         indexProblema = OutputDir.split("/")[-2]
         OutputDir = "/".join(OutputDir.split("/")[:-2])
         # indexProblema = os.path.basename(os.path.normpath(OutputDir))
@@ -926,45 +1016,44 @@ class FJSP(JSP):
             # print(self.speed)
             # for t in [0, 1, 2]:
             t = data.rddd
-            for s in range(1,self.speed+1):
-                s0, sf, sp = [0,s,1]
-                time = data.ProcessingTime[:, :, s0:sf:sp]
-                energy = data.EnergyConsumption[:, :, s0:sf:sp]
-                precedence = np.full((data.numJobs, data.numMchs), 0)
-
-                replace_data = {
-                    "machines": data.numMchs,
-                    "jobs": data.numJobs,
-                    "Speed": s,
-                    "time": str(time.flatten()).replace(" ", ", "),
-                    "energy": str(energy.flatten()).replace(" ", ", ")
-                }
-                if t == 1:
-                    replace_data["releaseDate"] = str([int(data.ReleaseDueDate[job, 0]) for job in range(data.numJobs)]).replace(" ", ",")
-                    replace_data["dueDate"] = str([int(data.ReleaseDueDate[job, 1]) for job in range(data.numJobs)]).replace(" ", ",")  
-                elif t == 2:
-                    replace_data["releaseDate"] = str(data.ReleaseDueDate[:, :, 0].flatten()).replace(" ", ",")
-                    replace_data["dueDate"] = str(data.ReleaseDueDate[:, :, 1].flatten()).replace(" ", ",")
-
-                for job in range(data.numJobs):
-                    for i, prioridad in enumerate(range(data.numMchs)):
-                        precedence[job, data.Orden[job, prioridad]] = i
-                replace_data["precedence"] = str(precedence.flatten()).replace(" ", ",")
-
-                replace_data["available_machines"] = str(data.available_machines.flatten()).replace(" ", ", ")
-
-                with open(f"./Minizinc/Types/RD/FJSP/type{t}.dzn", "r", encoding="utf-8") as file:
-                    filedata = file.read()
-                    for kk, v in replace_data.items():
-                        filedata = filedata.replace("{" + kk + "}", str(v))
-
-                    os.makedirs(f"{OutputDir}/", exist_ok=True)
-
-                    with open(f"{OutputDir}/{indexProblema}-{t}-{s}.dzn", "w+", encoding="utf-8") as new:
-                        new.write(filedata)
-                # print(f"{OutputDir}/{indexProblema}")
-                # with open(f"{OutputDir}/{indexProblema}", "wb") as new:
-                #     pickle.dump(new_object, new)
+            # for s in range(1,self.speed+1):
+            s= self.speed
+            s0, sf, sp = [0,s,1]
+            time = data.ProcessingTime[:, :, s0:sf:sp]
+            energy = data.EnergyConsumption[:, :, s0:sf:sp]
+            precedence = np.full((data.numJobs, data.numMchs), 0)
+
+            replace_data = {
+                "machines": data.numMchs,
+                "jobs": data.numJobs,
+                "Speed": s,
+                "time": str(time.flatten()).replace(" ", ", "),
+                "energy": str(energy.flatten()).replace(" ", ", ")
+            }
+            if t == 1:
+                replace_data["releaseDate"] = str([int(data.ReleaseDueDate[job, 0]) for job in range(data.numJobs)]).replace(" ", ",")
+                replace_data["dueDate"] = str([int(data.ReleaseDueDate[job, 1]) for job in range(data.numJobs)]).replace(" ", ",")  
+            elif t == 2:
+                replace_data["releaseDate"] = str(data.ReleaseDueDate[:, :, 0].flatten()).replace(" ", ",")
+                replace_data["dueDate"] = str(data.ReleaseDueDate[:, :, 1].flatten()).replace(" ", ",")
+
+            for job in range(data.numJobs):
+                for i, prioridad in enumerate(range(data.numMchs)):
+                    precedence[job, data.Orden[job, prioridad]] = i
+            replace_data["precedence"] = str(precedence.flatten()).replace(" ", ",")
+
+            replace_data["available_machines"] = str(data.available_machines.flatten()).replace(" ", ", ")
+
+            # with open(f"./Minizinc/Types/RD/FJSP/type{t}.dzn", "r", encoding="utf-8") as file:
+            #     filedata = file.read()
+            filedata = _read_text_resource(f"Minizinc/Types/RD/FJSP/type{t}.dzn")
+            for kk, v in replace_data.items():
+                filedata = filedata.replace("{" + kk + "}", str(v))
+
+            os.makedirs(f"{OutputDir}/", exist_ok=True)
+
+            with open(f"{OutputDir}/{indexProblema}-{t}-{s}_{index}.dzn", "w+", encoding="utf-8") as new:
+                new.write(filedata)
 
     def saveTaillardStandardFile(self, path):
         os.makedirs("/".join(path.split("/")[:-1]),exist_ok=True)
@@ -1036,14 +1125,12 @@ class Generator:
                 jsp_instance = JSP(jobs = jobs, machines = machines)
             case "FJSP":
                 jsp_instance = FJSP(jobs = jobs, machines = machines)
-
+        
         for index in range(1, size + 1):
-
             jsp_instance.fill_random_values(speed = speed, rddd = ReleaseDateDueDate, distribution = distribution, seed = seed,tpm = tpm)
 
             # Determinar el nombre de salida basado en `outputName` y los parámetros actuales
-            problem_path = self.savepath.format(size = size, jobs =jobs, machines = machines, release_due_date = ReleaseDateDueDate, 
-                                                    speed_scaling = speed, distribution = distribution, seed=seed)
+            problem_path = self.savepath.format(size = size, jobs =jobs, machines = machines, release_due_date = ReleaseDateDueDate,  speed_scaling = speed, distribution = distribution, seed=seed)
             
             if not (self.json or self.dzn or self.taillard): return jsp_instance
             
@@ -1059,7 +1146,7 @@ class Generator:
                 if self.dzn:
                     pkl_path = f"{problem_path}/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}.pkl"
                     jsp_instance.savePythonFile(pkl_path)
-                    jsp_instance.saveDznFile(pkl_path, problem_path + jm_path)#f"{j}x{m}_{i}")
+                    jsp_instance.saveDznFile(pkl_path, problem_path + jm_path,index)#f"{j}x{m}_{i}")
                     os.remove(pkl_path)
                 if self.taillard:
                     jsp_instance.saveTaillardStandardFile(problem_path + jm_path.split("/")[0] + f"_{j}x{m}_{i}.txt")
@@ -1069,7 +1156,7 @@ class Generator:
                 if self.dzn:
                     pkl_path = f"{problem_path}/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}.pkl"
                     jsp_instance.savePythonFile(pkl_path)
-                    jsp_instance.saveDznFile(pkl_path,f"{problem_path}/DZN/" + jm_path)#f"{j}x{m}_{i}")
+                    jsp_instance.saveDznFile(pkl_path,f"{problem_path}/DZN/" + jm_path,index)#f"{j}x{m}_{i}")
                     os.remove(pkl_path)
                 if self.taillard:
                     jsp_instance.saveTaillardStandardFile(f"{problem_path}/TAILLARD/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}.txt")

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

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

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

@@ -1,4 +1,4 @@
-IGJSP/generador.py,sha256=vpopW1e8zwZ5H69uvCSY28KJuP-XGNM6VQPKCTawiAs,48598
+IGJSP/generador.py,sha256=TJiEBaZkUSzLDn0tZJ7oMhbz2QJq51611F-v8X22oLk,50728
 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.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,,
+igjsp-1.1.3.dist-info/METADATA,sha256=qWUwuqSmPDChTMxgy_VbRSbUyclj5oibJCKDp6B3YXQ,10609
+igjsp-1.1.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+igjsp-1.1.3.dist-info/licenses/LICENSE,sha256=f7RDRO-z_nMoooAya7NAb8sXtrHR6WnttYtyUc9fB-c,1116
+igjsp-1.1.3.dist-info/RECORD,,