IGJSP 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

IGJSP/generador.py

@@ -3,16 +3,18 @@ import datetime
 import json
 import os
 import pickle
+import re
 from itertools import combinations
+
 import networkx as nx
 import numpy as np
-import re
 
 np.set_printoptions(linewidth=np.inf, threshold=np.inf, formatter={"int": lambda x: f"{x}"})
 
-from scipy.stats import expon, norm, uniform
 from pprint import pprint
 
+from scipy.stats import expon, norm, uniform
+
 
 def f(x):
     return int(np.exp(-int(x)/100)*100)
@@ -23,6 +25,13 @@ def g(x):
 def t(c):
     return 4.0704 * np.log(2) / np.log(1 + (c* 2.5093)**3)
 
+
+#################################################################################
+#                                                                               # 
+#                                    JSP                                       # 
+#                                                                               #
+#################################################################################
+
 class JSP:
     def __init__(self, jobs, machines, ProcessingTime=np.array([]), EnergyConsumption=np.array([]), ReleaseDateDueDate=np.array([]), Orden=np.array([])) -> None:       
         self.numJobs = jobs
@@ -202,35 +211,30 @@ class JSP:
                     "machines": data.numMchs,
                     "jobs": data.numJobs,
                     "Speed": s,
-                    "time": time.flatten(),
-                    "energy": energy.flatten(),
+                    "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"] = data.ReleaseDueDate[:, :, 0].flatten()
-                    replace_data["dueDate"] = data.ReleaseDueDate[:, :, 1].flatten()
+                    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"] = precedence.flatten()
+                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)
-                # print(f"{OutputDir}/{indexProblema}")
-                # with open(f"{OutputDir}/{indexProblema}", "wb") as new:
-                #     pickle.dump(new_object, new)
 
     def saveTaillardStandardFile(self, path):
         os.makedirs("/".join(path.split("/")[:-1]),exist_ok=True)
@@ -460,11 +464,6 @@ class JSP:
             if operation > 0 and operation < self.numMchs - 1:
                 graph.add_edge((job * self.numMchs + operation - 1, job * self.numMchs + operation))
 
-# if __name__ == "__main__":
-#     jsp = JSP(jobs=5, machines=5)
-#     jsp.fill_random_values(speed=3, rddd=2, distribution="uniform", seed=1234)
-#     jsp.saveTaillardStandardFile("./output_taillard.txt")
-
 
 
 #################################################################################
@@ -585,16 +584,16 @@ class FJSP(JSP):
                     "energy": str(energy.flatten()).replace(" ", ", ")
                 }
                 if t == 1:
-                    replace_data["releaseDate"] = str([int(data.ReleaseDueDate[job, 0]) for job in range(data.numJobs)])
-                    replace_data["dueDate"] = str([int(data.ReleaseDueDate[job, 1]) for job in range(data.numJobs)])
+                    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"] = data.ReleaseDueDate[:, :, 0].flatten()
-                    replace_data["dueDate"] = data.ReleaseDueDate[:, :, 1].flatten()
+                    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["precedence"] = str(precedence.flatten()).replace(" ", ",")
 
                 replace_data["available_machines"] = str(data.available_machines.flatten()).replace(" ", ", ")
 

{igjsp-1.0.0.dist-info → igjsp-1.0.1.dist-info}/METADATA

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

{igjsp-1.0.0.dist-info → igjsp-1.0.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-IGJSP/generador.py,sha256=AuiRTZ-tfRVt8U0-EECznq85NtDZsLyZLCAIjM1U8-8,34124
+IGJSP/generador.py,sha256=w9SxkVC3oj4inIH9gP_CKvOecMm84_TVS08Kbc12A6E,34349
 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.0.0.dist-info/METADATA,sha256=zU57DaxL2XUGadX8d5Bxlyfo8uUxgD1X_f43gKDMSns,10609
-igjsp-1.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-igjsp-1.0.0.dist-info/licenses/LICENSE,sha256=f7RDRO-z_nMoooAya7NAb8sXtrHR6WnttYtyUc9fB-c,1116
-igjsp-1.0.0.dist-info/RECORD,,
+igjsp-1.0.1.dist-info/METADATA,sha256=xBsUY3HSGQvowsRaCPdf1wmwU8N9N_c9QykR2Y7dZs4,10609
+igjsp-1.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+igjsp-1.0.1.dist-info/licenses/LICENSE,sha256=f7RDRO-z_nMoooAya7NAb8sXtrHR6WnttYtyUc9fB-c,1116
+igjsp-1.0.1.dist-info/RECORD,,