IGJSP 1.1.9__tar.gz → 1.1.11__tar.gz

{igjsp-1.1.9 → igjsp-1.1.11}/PKG-INFO

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

{igjsp-1.1.9 → igjsp-1.1.11}/pyproject.toml

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

{igjsp-1.1.9 → igjsp-1.1.11}/src/IGJSP/generador.py

@@ -159,7 +159,7 @@ class JSP:
         #         tpm = [max(10, data) for data in np.random.normal(50, 20, self.numMchs)]
         #     else:
         #         tpm = expon(loc=10, scale=20).rvs(self.numMchs)
-        energyPer, timePer = self._particionate_speed_space(speed)
+        _, timePer = self._particionate_speed_space(speed)
         self._generate_standar_operation_cost(distribution,tpm)
 
         self.ProcessingTime = np.zeros((self.numJobs, self.numMchs, self.speed), dtype=int)
@@ -185,7 +185,7 @@ class JSP:
     def _particionate_speed_space(self, speed):
         energyPer = np.linspace(0.5, 3, speed) if speed > 1 else [1]
         # timePer = [t(c) for c in energyPer]
-        timePer = sorted([random.uniform(0, 100)/100 for _ in range(3)])
+        timePer = sorted([random.uniform(0, 100)/100 for _ in range(speed)])
         return energyPer, timePer
 
     def _generate_standar_operation_cost(self, distribution,tpm=[]):
@@ -225,7 +225,7 @@ class JSP:
             # time = max(1, self.operationCost[job, machine] * tper)
             # ans.append((time, max(1, f(time))))
             # ans.append((time, max(1, f(time))))
-        timePer = sorted([random.uniform(0, 100)/100 for _ in range(3)])
+        timePer = sorted([random.uniform(0, 100)/100 for _ in range(self.speed)])
         return [(round(i*100),round((1-i)*100)) for i in timePer]
 
     def _release_due(self, duration, distribution):
@@ -657,9 +657,11 @@ class JSP:
             # 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)
+            # precedence = np.full((data.numJobs, data.numMchs), 0)
+            precedence = data.Orden
 
             replace_data = {
                 "machines": data.numMchs,
@@ -677,9 +679,12 @@ class JSP:
                 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
+            
+            # print(data.JSP["timeEnergy"])
+            # quit()
+            # 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(" ", ", ")
             
@@ -1169,23 +1174,23 @@ class Generator:
 
             if self.single_folder_output:
                 if self.json:
-                    jsp_instance.saveJsonFile(problem_path + jm_path.split("/")[0] + f"_{j}x{m}_{i}.json")
+                    jsp_instance.saveJsonFile(problem_path + jm_path.split("/")[0] + f"_{j}x{m}_{i}_{index}.json")
                 if self.dzn:
-                    pkl_path = f"{problem_path}/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}.pkl"
+                    pkl_path = f"{problem_path}/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}_{index}.pkl"
                     jsp_instance.savePythonFile(pkl_path)
                     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")
+                    jsp_instance.saveTaillardStandardFile(problem_path + jm_path.split("/")[0] + f"_{j}x{m}_{i}_{index}.txt")
             else:
                 if self.json:
-                    jsp_instance.saveJsonFile(f"{problem_path}/JSON/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}.json")
+                    jsp_instance.saveJsonFile(f"{problem_path}/JSON/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}_{index}.json")
                 if self.dzn:
-                    pkl_path = f"{problem_path}/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}.pkl"
+                    pkl_path = f"{problem_path}/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}_{index}.pkl"
                     jsp_instance.savePythonFile(pkl_path)
                     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")
+                    jsp_instance.saveTaillardStandardFile(f"{problem_path}/TAILLARD/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}_{index}.txt")
             instances.append(copy.deepcopy(jsp_instance))
         return instances