IGJSP 0.0.3__tar.gz → 0.0.5__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-0.0.3 → igjsp-0.0.5}/PKG-INFO +2 -2
- {igjsp-0.0.3 → igjsp-0.0.5}/pyproject.toml +1 -1
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/generador.py +1 -3
- {igjsp-0.0.3 → igjsp-0.0.5}/.vscode/settings.json +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/LICENSE +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/README.md +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/Minizinc/Models/RD/JSP0.mzn +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/Minizinc/Models/RD/JSP1.mzn +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/Minizinc/Models/RD/JSP2.mzn +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/Minizinc/Types/RD/JSP0.mzn +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/Minizinc/Types/RD/JSP1.mzn +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/Minizinc/Types/RD/JSP2.mzn +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/Minizinc/Types/RD/type0.dzn +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/Minizinc/Types/RD/type1.dzn +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/Minizinc/Types/RD/type2.dzn +0 -0
- {igjsp-0.0.3 → igjsp-0.0.5}/src/IGJSP/main.py +0 -0
|
@@ -168,7 +168,7 @@ class JSP:
|
|
|
168
168
|
# indexProblema = os.path.basename(os.path.normpath(OutputDir))
|
|
169
169
|
with open(f"{InputDir}", 'rb') as f:
|
|
170
170
|
data: JSP = pickle.load(f)
|
|
171
|
-
print(self.speed)
|
|
171
|
+
# print(self.speed)
|
|
172
172
|
# for t in [0, 1, 2]:
|
|
173
173
|
t = data.rddd
|
|
174
174
|
for s in range(1,self.speed+1):
|
|
@@ -454,7 +454,6 @@ class Generator:
|
|
|
454
454
|
def generate_new_instance(self, jobs = 10, machines = 4, ProcessingTime=[], EnergyConsumption=[], Orden=[],speed = 1, ReleaseDateDueDate = 0, distribution = "uniform" , seed = 0, tpm=[]):
|
|
455
455
|
jsp = JSP(jobs=jobs, machines=machines,ProcessingTime=ProcessingTime,EnergyConsumption=EnergyConsumption,Orden=Orden)
|
|
456
456
|
jsp.fill_random_values(speed = speed, rddd = ReleaseDateDueDate, distribution = distribution, seed = seed,tpm = tpm)
|
|
457
|
-
|
|
458
457
|
if not (self.json or self.dzn or self.taillard): return jsp
|
|
459
458
|
|
|
460
459
|
j = str(jobs)
|
|
@@ -465,7 +464,6 @@ class Generator:
|
|
|
465
464
|
|
|
466
465
|
if self.json:
|
|
467
466
|
jsp.saveJsonFile(f"{self.savepath}/JSON/"+jm_path.split("/")[0]+f"_{j}x{m}_{i}.json")
|
|
468
|
-
pass
|
|
469
467
|
if self.dzn:
|
|
470
468
|
pkl_path = f"{self.savepath}/"+jm_path.split("/")[0]+f"_{j}x{m}_{i}.pkl"
|
|
471
469
|
jsp.savePythonFile(pkl_path)
|
|
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
|