IGJSP 1.1.5__tar.gz → 1.1.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IGJSP
-Version: 1.1.5
+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.5 → igjsp-1.1.7}/pyproject.toml

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

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

@@ -3,6 +3,7 @@ import datetime
 import json
 import os
 import pickle
+import random
 import re
 from itertools import combinations
 
@@ -11,11 +12,11 @@ import numpy as np
 
 np.set_printoptions(linewidth=np.inf, threshold=np.inf, formatter={"int": lambda x: f"{x}"})
 
+from importlib.resources import as_file, files
 from pprint import pprint
 
 from scipy.stats import expon, norm, uniform
 
-from importlib.resources import files, as_file
 
 def _read_text_resource(rel_path: str, encoding: str = "utf-8") -> str:
     p = files("IGJSP").joinpath(rel_path)
@@ -132,7 +133,7 @@ def _parse_array_generic(text, name):
 
 #################################################################################
 #                                                                               # 
-#                                    JSP                                       # 
+#                                    JSP                                        # 
 #                                                                               #
 #################################################################################
 
@@ -161,6 +162,9 @@ class JSP:
         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)
+
         self.ProcessingTime = np.zeros((self.numJobs, self.numMchs, self.speed), dtype=int)
         self.EnergyConsumption = np.zeros((self.numJobs, self.numMchs, self.speed), dtype=int)
         self.Orden = np.zeros((self.numJobs, self.numMchs), dtype=int)
@@ -183,7 +187,8 @@ 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 = [t(c) for c in energyPer]
+        timePer = sorted([random.uniform(0, 100)/100 for _ in range(3)])
         return energyPer, timePer
 
     def _generate_standar_operation_cost(self, distribution,tpm=[]):
@@ -213,16 +218,18 @@ class JSP:
                     self.ReleaseDueDate[job, machine, 1] = releaseDateTask
                 else:
                     releaseDateTask += np.median(self.ProcessingTime[job, machine, :])
+            
             if self.rddd == 1:
                 self.ReleaseDueDate[job] = [initial, int(self._release_due(releaseDateTask, distribution))]
-    
 
     def _genProcEnergy(self, job, machine, timePer):        
-        ans = []  
-        for tper in timePer:
-            time = max(1, self.operationCost[job, machine] * tper)
-            ans.append((time, max(1, f(time))))
-        return ans
+        # ans = []  
+        # for tper in timePer:
+            # 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)])
+        return [(round(i*100),round((1-i)*100)) for i in timePer]
 
     def _release_due(self, duration, distribution):
         if distribution == "uniform":
@@ -667,7 +674,6 @@ class JSP:
 
             if t == 1:
                 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:
@@ -679,6 +685,7 @@ class JSP:
                     precedence[job, data.Orden[job, prioridad]] = i
 
             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()