IGJSP 1.1.6__tar.gz → 1.1.7__tar.gz

{igjsp-1.1.6 → igjsp-1.1.7}/PKG-INFO

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

{igjsp-1.1.6 → igjsp-1.1.7}/pyproject.toml

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

{igjsp-1.1.6 → igjsp-1.1.7}/src/IGJSP/generador.py

@@ -133,7 +133,7 @@ def _parse_array_generic(text, name):
 
 #################################################################################
 #                                                                               # 
-#                                    JSP                                       # 
+#                                    JSP                                        # 
 #                                                                               #
 #################################################################################
 
@@ -151,14 +151,17 @@ class JSP:
         np.random.seed(seed)
         self.rddd = rddd
         self.speed = speed
-        if not tpm or len(tpm) != self.numMchs:
-            if distribution == "uniform":
-                tpm = np.random.uniform(10, 100, self.numMchs)
-            elif distribution == "normal":
-                tpm = [max(10, data) for data in np.random.normal(50, 20, self.numMchs)]
-            else:
-                tpm = expon(loc=10, scale=20).rvs(self.numMchs)
-       
+        #Elimino por que no hace caso del seed. Se tiene que hacer antes de llamar a esta función
+        # if not tpm or len(tpm) != self.numMchs:
+        #     if distribution == "uniform":
+        #         tpm = np.random.uniform(10, 100, self.numMchs)
+        #     elif distribution == "normal":
+        #         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)
+        self._generate_standar_operation_cost(distribution,tpm)
+        
         energyPer, timePer = self._particionate_speed_space(speed)
         self._generate_standar_operation_cost(distribution)
 
@@ -188,13 +191,16 @@ class JSP:
         timePer = sorted([random.uniform(0, 100)/100 for _ in range(3)])
         return energyPer, timePer
 
-    def _generate_standar_operation_cost(self, distribution):
-        if distribution == "uniform":
-            self.operationCost = np.random.uniform(10, 100, (self.numJobs, self.numMchs))
-        elif distribution == "normal":
-            self.operationCost = np.array([max(10, x) for x in np.random.normal(50, 20, (self.numJobs, self.numMchs)).reshape(-1)]).reshape(self.numJobs, self.numMchs)
-        elif distribution == "exponential":
-            self.operationCost = np.random.exponential(10, (self.numJobs, self.numMchs))
+    def _generate_standar_operation_cost(self, distribution,tpm=[]):
+        if np.array(tpm).shape != (self.numJobs, self.numMchs):
+            if distribution == "uniform":
+                self.operationCost = np.random.uniform(10, 100, (self.numJobs, self.numMchs))
+            elif distribution == "normal":
+                self.operationCost = np.array([max(10, x) for x in np.random.normal(50, 20, (self.numJobs, self.numMchs)).reshape(-1)]).reshape(self.numJobs, self.numMchs)
+            elif distribution == "exponential":
+                self.operationCost = np.random.exponential(10, (self.numJobs, self.numMchs))
+        else:
+            self.operationCost = tpm
 
     def _jobToMachine(self, release_date_tasks, timePer, distribution):
         for job in range(self.numJobs):
@@ -667,17 +673,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["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()
@@ -1130,11 +1138,27 @@ class Generator:
                 jsp_instance = JSP(jobs = jobs, machines = machines)
             case "FJSP":
                 jsp_instance = FJSP(jobs = jobs, machines = machines)
-        instances = []
+                
+        tpm_aux=[]
+        orden_aux=[]
+        for index in range(1, size + 1):
+            if len(tpm) != machines:
+                if distribution == "uniform":
+                    aux = np.random.uniform(10, 100, (jobs, machines))
+                elif distribution == "normal":
+                    aux = np.array([max(10, x) for x in np.random.normal(50, 20, (jobs, machines)).reshape(-1)]).reshape(jobs, machines)
+                elif distribution == "exponential":
+                    aux = np.random.exponential(10, (jobs, machines))
+            tpm_aux.append(aux)
+        
+            orden_aux.append([np.random.choice(range(machines), machines, replace=False) for job in range(jobs)])
+        
+        orden_aux = np.array(orden_aux)
+        
         for index in range(1, size + 1):
-            
-            jsp_instance.fill_random_values(speed = speed, rddd = ReleaseDateDueDate, distribution = distribution, seed = seed,tpm = tpm)
 
+            jsp_instance.fill_random_values(speed = speed, rddd = ReleaseDateDueDate, distribution = distribution, seed = seed,tpm = tpm_aux[index-1])
+            jsp_instance.Orden = orden_aux[index-1]
             # Determinar el nombre de salida basado en `outputName` y los parámetros actuales
             problem_path = self.savepath.format(size = size, jobs =jobs, machines = machines, release_due_date = ReleaseDateDueDate,  speed_scaling = speed, distribution = distribution, seed=seed)
             
@@ -1166,5 +1190,5 @@ class Generator:
                     os.remove(pkl_path)
                 if self.taillard:
                     jsp_instance.saveTaillardStandardFile(f"{problem_path}/TAILLARD/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}.txt")
-            instances.append(jsp_instance)
-        return instances if len(instances) >1 else instances[0]
+
+        return jsp_instance