IGJSP 1.1.7__py3-none-any.whl → 1.1.9__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. IGJSP/generador.py +3 -6
  2. {igjsp-1.1.7.dist-info → igjsp-1.1.9.dist-info}/METADATA +1 -1
  3. {igjsp-1.1.7.dist-info → igjsp-1.1.9.dist-info}/RECORD +5 -5
  4. {igjsp-1.1.7.dist-info → igjsp-1.1.9.dist-info}/WHEEL +0 -0
  5. {igjsp-1.1.7.dist-info → igjsp-1.1.9.dist-info}/licenses/LICENSE +0 -0
IGJSP/generador.py CHANGED
@@ -161,9 +161,6 @@ class JSP:
161
161
  # tpm = expon(loc=10, scale=20).rvs(self.numMchs)
162
162
  energyPer, timePer = self._particionate_speed_space(speed)
163
163
  self._generate_standar_operation_cost(distribution,tpm)
164
-
165
- energyPer, timePer = self._particionate_speed_space(speed)
166
- self._generate_standar_operation_cost(distribution)
167
164
 
168
165
  self.ProcessingTime = np.zeros((self.numJobs, self.numMchs, self.speed), dtype=int)
169
166
  self.EnergyConsumption = np.zeros((self.numJobs, self.numMchs, self.speed), dtype=int)
@@ -1154,7 +1151,7 @@ class Generator:
1154
1151
  orden_aux.append([np.random.choice(range(machines), machines, replace=False) for job in range(jobs)])
1155
1152
 
1156
1153
  orden_aux = np.array(orden_aux)
1157
-
1154
+ instances = []
1158
1155
  for index in range(1, size + 1):
1159
1156
 
1160
1157
  jsp_instance.fill_random_values(speed = speed, rddd = ReleaseDateDueDate, distribution = distribution, seed = seed,tpm = tpm_aux[index-1])
@@ -1190,5 +1187,5 @@ class Generator:
1190
1187
  os.remove(pkl_path)
1191
1188
  if self.taillard:
1192
1189
  jsp_instance.saveTaillardStandardFile(f"{problem_path}/TAILLARD/" + jm_path.split("/")[0] + f"_{j}x{m}_{i}.txt")
1193
-
1194
- return jsp_instance
1190
+ instances.append(copy.deepcopy(jsp_instance))
1191
+ return instances
{igjsp-1.1.7.dist-info → igjsp-1.1.9.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: IGJSP
3
- Version: 1.1.7
3
+ Version: 1.1.9
4
4
  Summary: Instance generator for JSP
5
5
  Project-URL: Homepage, https://gps.blogs.upv.es/
6
6
  Author-email: GPS-UPV <gps@dsic.upv.es>
{igjsp-1.1.7.dist-info → igjsp-1.1.9.dist-info}/RECORD RENAMED
@@ -1,4 +1,4 @@
1
- IGJSP/generador.py,sha256=upjnvXovOjXOIc4IsMmNYDgvJ9EJD5_xICY6nZ8QyCE,52223
1
+ IGJSP/generador.py,sha256=bXDnW5Bg23PqfFfDYDRGm53YK7L2uiktaRBjrhtPFxY,52152
2
2
  IGJSP/main.py,sha256=Sia5Ss8O3HWBdshvPLJKUMaZIoQPHy6x8yzvojojPFo,2838
3
3
  IGJSP/Minizinc/Models/RD/JSP0.mzn,sha256=cfN_E3RQ6nBulGfaOOYTd-zAgA5SI6E2saDlYtKCflg,2282
4
4
  IGJSP/Minizinc/Models/RD/JSP1.mzn,sha256=5B8cyw2WyKR8yEL1fFd0TaCAVhjPoxEJRJDPPEjJGEk,2840
@@ -12,7 +12,7 @@ IGJSP/Minizinc/Types/RD/FJSP/type2.dzn,sha256=Wz1MnkSL5GUPsbh1eq0leoaQRImkNqQqkX
12
12
  IGJSP/Minizinc/Types/RD/JSP/type0.dzn,sha256=wNuPQkXBXPSpPaPz2WFhp4pGDgfSimtg4I93UfwC01Q,263
13
13
  IGJSP/Minizinc/Types/RD/JSP/type1.dzn,sha256=Xbt9StzCgEqqh_HS9tWGrTVtu-OEnf5Yq5Ty91AkzoM,333
14
14
  IGJSP/Minizinc/Types/RD/JSP/type2.dzn,sha256=L2nc7bPJEhyuaEwgw0ZCpC52CpVJILQU_WQdKn8GUZs,379
15
- igjsp-1.1.7.dist-info/METADATA,sha256=2S9M5BhlreyQLtxQi1AL5D_ZNhLAzpJ49hALp87-e-o,10589
16
- igjsp-1.1.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
17
- igjsp-1.1.7.dist-info/licenses/LICENSE,sha256=f7RDRO-z_nMoooAya7NAb8sXtrHR6WnttYtyUc9fB-c,1116
18
- igjsp-1.1.7.dist-info/RECORD,,
15
+ igjsp-1.1.9.dist-info/METADATA,sha256=G5NdAy5zieIPPeOBfcA7xGFH6IBscNZLm3EIDg1CqOs,10589
16
+ igjsp-1.1.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
17
+ igjsp-1.1.9.dist-info/licenses/LICENSE,sha256=f7RDRO-z_nMoooAya7NAb8sXtrHR6WnttYtyUc9fB-c,1116
18
+ igjsp-1.1.9.dist-info/RECORD,,
{igjsp-1.1.7.dist-info → igjsp-1.1.9.dist-info}/WHEEL RENAMED
File without changes