IGJSP 0.0.2__tar.gz → 0.0.3__tar.gz

{igjsp-0.0.2 → igjsp-0.0.3}/PKG-INFO

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

{igjsp-0.0.2 → igjsp-0.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "IGJSP"
-version = "0.0.2"
+version = "0.0.3"
 authors = [
   { name="GPS-UPV", email="gps@dsic.upv.es" },
 ]
@@ -26,4 +26,4 @@ dependencies = [
 Homepage = "https://gps.blogs.upv.es/"
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/IGJSP"]
+packages = ["src/IGJSP","src/Minizinc"]

{igjsp-0.0.2 → igjsp-0.0.3}/src/IGJSP/generador.py

@@ -168,47 +168,47 @@ class JSP:
         # indexProblema = os.path.basename(os.path.normpath(OutputDir))
         with open(f"{InputDir}", 'rb') as f:
             data: JSP = pickle.load(f)
-            for t in [0, 1, 2]:
-                for s in range(1,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": list(time.flatten()),
-                        "energy": list(energy.flatten())
-                    }
-                    
-                    if t == 1:
-                        replace_data["releaseDate"] = [data.ReleaseDueDate[job, :, 0].min() for job in range(data.numJobs)]
-                        replace_data["dueDate"] = [data.ReleaseDueDate[job, :, 0].max() for job in range(data.numJobs)]
-                    elif t == 2:
-                        replace_data["releaseDate"] = list(data.ReleaseDueDate[:, :, 0].flatten())
-                        replace_data["dueDate"] = list(data.ReleaseDueDate[:, :, 1].flatten())
-
-                    for job in range(data.numJobs):
-                        for i, prioridad in enumerate(range(data.numMchs)):
-                            precedence[job, data.Orden[job, prioridad]] = i
-                    replace_data["precedence"] = list(precedence.flatten())
-
-                    new_object = data.change_rddd_type(t).select_speeds(list(range(s0, sf, sp)))
-
-                    with open(f"./Minizinc/Types/RD/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)
+            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": list(time.flatten()),
+                    "energy": list(energy.flatten())
+                }
+                if t == 1:
+                    replace_data["releaseDate"] = [data.ReleaseDueDate[job, 0] for job in range(data.numJobs)]
+                    replace_data["dueDate"] = [data.ReleaseDueDate[job, 1] for job in range(data.numJobs)]
+                elif t == 2:
+                    replace_data["releaseDate"] = list(data.ReleaseDueDate[:, :, 0].flatten())
+                    replace_data["dueDate"] = list(data.ReleaseDueDate[:, :, 1].flatten())
+
+                for job in range(data.numJobs):
+                    for i, prioridad in enumerate(range(data.numMchs)):
+                        precedence[job, data.Orden[job, prioridad]] = i
+                replace_data["precedence"] = list(precedence.flatten())
+
+                new_object = data.change_rddd_type(t).select_speeds(list(range(s0, sf, sp)))
+                with open(f"./Minizinc/Types/RD/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)
 
     def saveTaillardStandardFile(self, path):
         os.makedirs("/".join(path.split("/")[:-1]),exist_ok=True)