IGJSP 1.1.3__tar.gz → 1.1.4__tar.gz

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

@@ -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 → igjsp-1.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "IGJSP"
-version = "1.1.3"
+version = "1.1.4"
 authors = [
   { name = "GPS-UPV", email = "gps@dsic.upv.es" },
 ]

{igjsp-1.1.3 → igjsp-1.1.4}/src/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()