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

IGJSP/generador.py

@@ -662,17 +662,19 @@ class JSP:
             }
 
             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(", ", " ")
+                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(", ", " ")
+                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(" ", ", ")
             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()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IGJSP
-Version: 1.1.3
+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.3.dist-info → igjsp-1.1.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-IGJSP/generador.py,sha256=TJiEBaZkUSzLDn0tZJ7oMhbz2QJq51611F-v8X22oLk,50728
+IGJSP/generador.py,sha256=XepqDE-sQ1u9j9tt0Mp5CPb3RN6gP25kFhKDcjazcqM,50783
 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.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,,
+igjsp-1.1.4.dist-info/METADATA,sha256=V_ObIzwrlMpGF_0pHFM9lYmLVlu9jFBKPQqgFsxoFSo,10609
+igjsp-1.1.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+igjsp-1.1.4.dist-info/licenses/LICENSE,sha256=f7RDRO-z_nMoooAya7NAb8sXtrHR6WnttYtyUc9fB-c,1116
+igjsp-1.1.4.dist-info/RECORD,,