IGJSP 1.1.2__tar.gz → 1.1.4__tar.gz

{igjsp-1.1.2 → igjsp-1.1.4}/PKG-INFO

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

{igjsp-1.1.2 → igjsp-1.1.4}/pyproject.toml

@@ -4,17 +4,17 @@ build-backend = "hatchling.build"
 
 [project]
 name = "IGJSP"
-version = "1.1.2"
+version = "1.1.4"
 authors = [
-  { name="GPS-UPV", email="gps@dsic.upv.es" },
+  { name = "GPS-UPV", email = "gps@dsic.upv.es" },
 ]
 description = "Instance generator for JSP"
 readme = "README.md"
 requires-python = ">=3.9"
 classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent",
 ]
 dependencies = [
   "numpy",
@@ -26,4 +26,11 @@ dependencies = [
 Homepage = "https://gps.blogs.upv.es/"
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/IGJSP","src/Minizinc"]
+packages = ["src/IGJSP"]
+
+[tool.hatch.build.targets.sdist]
+include = [
+  "src/IGJSP/**",
+  "README.md",
+  "pyproject.toml",
+]

{igjsp-1.1.2 → igjsp-1.1.4}/src/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)
@@ -628,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))
@@ -637,40 +646,43 @@ 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(data.ReleaseDueDate[:, 0].flatten()).replace(" ",", ")
+                # replace_data["releaseDate"] = ", ".join(list(map(str,data.ReleaseDueDate[:, 0])))
+                replace_data["dueDate"] = str(data.ReleaseDueDate[:, 1].flatten()).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)
@@ -997,7 +1009,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))
@@ -1006,45 +1018,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)
@@ -1116,14 +1127,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
             
@@ -1139,7 +1148,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")
@@ -1149,7 +1158,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.2/.gitattributes

@@ -1,2 +0,0 @@
-*.whl filter=lfs diff=lfs merge=lfs -text
-*.tar.gz filter=lfs diff=lfs merge=lfs -text

igjsp-1.1.2/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "python.REPL.enableREPLSmartSend": false
-}