IGJSP 1.1.10__tar.gz → 1.1.11__tar.gz
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.
- {igjsp-1.1.10 → igjsp-1.1.11}/PKG-INFO +1 -1
- {igjsp-1.1.10 → igjsp-1.1.11}/pyproject.toml +1 -1
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/generador.py +3 -3
- {igjsp-1.1.10 → igjsp-1.1.11}/.gitignore +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/LICENSE +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/README.md +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Models/RD/JSP0.mzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Models/RD/JSP1.mzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Models/RD/JSP2.mzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Types/RD/FJSP/type0.dzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Types/RD/FJSP/type1.dzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Types/RD/FJSP/type2.dzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Types/RD/JSP/type0.dzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Types/RD/JSP/type1.dzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Types/RD/JSP/type2.dzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Types/RD/JSP0.mzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Types/RD/JSP1.mzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/Minizinc/Types/RD/JSP2.mzn +0 -0
- {igjsp-1.1.10 → igjsp-1.1.11}/src/IGJSP/main.py +0 -0
|
@@ -159,7 +159,7 @@ class JSP:
|
|
|
159
159
|
# tpm = [max(10, data) for data in np.random.normal(50, 20, self.numMchs)]
|
|
160
160
|
# else:
|
|
161
161
|
# tpm = expon(loc=10, scale=20).rvs(self.numMchs)
|
|
162
|
-
|
|
162
|
+
_, timePer = self._particionate_speed_space(speed)
|
|
163
163
|
self._generate_standar_operation_cost(distribution,tpm)
|
|
164
164
|
|
|
165
165
|
self.ProcessingTime = np.zeros((self.numJobs, self.numMchs, self.speed), dtype=int)
|
|
@@ -185,7 +185,7 @@ class JSP:
|
|
|
185
185
|
def _particionate_speed_space(self, speed):
|
|
186
186
|
energyPer = np.linspace(0.5, 3, speed) if speed > 1 else [1]
|
|
187
187
|
# timePer = [t(c) for c in energyPer]
|
|
188
|
-
timePer = sorted([random.uniform(0, 100)/100 for _ in range(
|
|
188
|
+
timePer = sorted([random.uniform(0, 100)/100 for _ in range(speed)])
|
|
189
189
|
return energyPer, timePer
|
|
190
190
|
|
|
191
191
|
def _generate_standar_operation_cost(self, distribution,tpm=[]):
|
|
@@ -225,7 +225,7 @@ class JSP:
|
|
|
225
225
|
# time = max(1, self.operationCost[job, machine] * tper)
|
|
226
226
|
# ans.append((time, max(1, f(time))))
|
|
227
227
|
# ans.append((time, max(1, f(time))))
|
|
228
|
-
timePer = sorted([random.uniform(0, 100)/100 for _ in range(
|
|
228
|
+
timePer = sorted([random.uniform(0, 100)/100 for _ in range(self.speed)])
|
|
229
229
|
return [(round(i*100),round((1-i)*100)) for i in timePer]
|
|
230
230
|
|
|
231
231
|
def _release_due(self, duration, distribution):
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|