IGJSP 0.0.4__py3-none-any.whl → 0.0.5__py3-none-any.whl

IGJSP/generador.py

@@ -11,6 +11,7 @@ from pathlib import Path
 import networkx as nx
 import numpy as np
 from scipy.stats import expon, norm, uniform
+from pprint import pprint
 
 
 def f(x):
@@ -49,10 +50,7 @@ class JSP:
 
         self.ProcessingTime = np.zeros((self.numJobs, self.numMchs, self.speed), dtype=int)
         self.EnergyConsumption = np.zeros((self.numJobs, self.numMchs, self.speed), dtype=int)
-
-        
-        if len(self.Orden) == 0:
-            self.Orden = np.zeros((self.numJobs, self.numMchs), dtype=int)
+        self.Orden = np.zeros((self.numJobs, self.numMchs), dtype=int)
 
         if self.rddd == 0:
             release_date_tasks = np.array([0] * self.numJobs)
@@ -165,52 +163,56 @@ class JSP:
             json.dump(self.JSP, f, indent=4)
 
     def saveDznFile(self, InputDir, OutputDir):
-        indexProblema = os.path.basename(os.path.normpath(OutputDir))
+        indexProblema = OutputDir.split("/")[-2]
+        OutputDir = "/".join(OutputDir.split("/")[:-2])
+        # indexProblema = os.path.basename(os.path.normpath(OutputDir))
         with open(f"{InputDir}", 'rb') as f:
             data: JSP = pickle.load(f)
-            for t in [0, 1, 2]:
-                for s0, sf, sp, s in [(2, 3, 1, 1), (0, 5, 2, 3), (0, 5, 1, 5)]:
-                    time = data.ProcessingTime[:, :, s0:sf:sp]
-                    energy = data.EnergyConsumption[:, :, s0:sf:sp]
-                    precedence = np.full((data.numJobs, data.numMchs), 0)
-
-                    replace_data = {
-                        "machines": data.numMchs,
-                        "jobs": data.numJobs,
-                        "Speed": s,
-                        "time": list(time.flatten()),
-                        "energy": list(energy.flatten())
-                    }
-                    
-                    if t == 1:
-                        replace_data["releaseDate"] = [data.ReleaseDueDate[job, :, 0].min() for job in range(data.numJobs)]
-                        replace_data["dueDate"] = [data.ReleaseDueDate[job, :, 0].max() for job in range(data.numJobs)]
-                    elif t == 2:
-                        replace_data["releaseDate"] = list(data.ReleaseDueDate[:, :, 0].flatten())
-                        replace_data["dueDate"] = list(data.ReleaseDueDate[:, :, 1].flatten())
-
-                    for job in range(data.numJobs):
-                        for i, prioridad in enumerate(range(data.numMchs)):
-                            precedence[job, data.Orden[job, prioridad]] = i
-                    replace_data["precedence"] = list(precedence.flatten())
-
-                    new_object = data.change_rddd_type(t).select_speeds(list(range(s0, sf, sp)))
-
-                    with open(f"./Minizinc/Types/RD/type{t}.dzn", "r", encoding="utf-8") as file:
-                        filedata = file.read()
-                        for kk, v in replace_data.items():
-                            filedata = filedata.replace("{" + kk + "}", str(v))
-
-                        os.makedirs(f"{OutputDir}", exist_ok=True)
-                        
-                        with open(f"{OutputDir}/{indexProblema}-{t}-{s}.dzn", "w+", encoding="utf-8") as new:
-                            new.write(filedata)
-
-                    with open(f"{OutputDir}/{indexProblema}", "wb") as new:
-                        pickle.dump(new_object, new)
+            # print(self.speed)
+            # for t in [0, 1, 2]:
+            t = data.rddd
+            for s in range(1,self.speed+1):
+                s0, sf, sp = [0,s,1]
+                time = data.ProcessingTime[:, :, s0:sf:sp]
+                energy = data.EnergyConsumption[:, :, s0:sf:sp]
+                precedence = np.full((data.numJobs, data.numMchs), 0)
+
+                replace_data = {
+                    "machines": data.numMchs,
+                    "jobs": data.numJobs,
+                    "Speed": s,
+                    "time": list(time.flatten()),
+                    "energy": list(energy.flatten())
+                }
+                if t == 1:
+                    replace_data["releaseDate"] = [data.ReleaseDueDate[job, 0] for job in range(data.numJobs)]
+                    replace_data["dueDate"] = [data.ReleaseDueDate[job, 1] for job in range(data.numJobs)]
+                elif t == 2:
+                    replace_data["releaseDate"] = list(data.ReleaseDueDate[:, :, 0].flatten())
+                    replace_data["dueDate"] = list(data.ReleaseDueDate[:, :, 1].flatten())
+
+                for job in range(data.numJobs):
+                    for i, prioridad in enumerate(range(data.numMchs)):
+                        precedence[job, data.Orden[job, prioridad]] = i
+                replace_data["precedence"] = list(precedence.flatten())
+
+                new_object = data.change_rddd_type(t).select_speeds(list(range(s0, sf, sp)))
+                with open(f"./Minizinc/Types/RD/type{t}.dzn", "r", encoding="utf-8") as file:
+                    filedata = file.read()
+                    for kk, v in replace_data.items():
+                        filedata = filedata.replace("{" + kk + "}", str(v))
+
+                    os.makedirs(f"{OutputDir}/", exist_ok=True)
+
+                    with open(f"{OutputDir}/{indexProblema}-{t}-{s}.dzn", "w+", encoding="utf-8") as new:
+                        new.write(filedata)
+                # print(f"{OutputDir}/{indexProblema}")
+                # with open(f"{OutputDir}/{indexProblema}", "wb") as new:
+                #     pickle.dump(new_object, new)
 
     def saveTaillardStandardFile(self, path):
-        with open(path, 'w') as f:
+        os.makedirs("/".join(path.split("/")[:-1]),exist_ok=True)
+        with open(path, 'w+') as f:
             # Escribir el encabezado con el número de trabajos y máquinas
             f.write(f"Number of jobs: {self.numJobs}\n")
             f.write(f"Number of machines: {self.numMchs}\n\n")
@@ -251,9 +253,7 @@ class JSP:
             return self
         new_object = copy.deepcopy(self)
         new_object.speed = len(speeds)
-        
         new_object.ProcessingTime = new_object.ProcessingTime[:, :, speeds]
-        
         new_object.EnergyConsumption = new_object.EnergyConsumption[:, :, speeds]
         new_object.generate_maxmin_objective_values()
         return new_object
@@ -444,14 +444,31 @@ class JSP:
 #     jsp.fill_random_values(speed=3, rddd=2, distribution="uniform", seed=1234)
 #     jsp.saveTaillardStandardFile("./output_taillard.txt")
 
-# class generador:
-#     def __init__( self,jobs, machines, ProcessingTime=[], EnergyConsumption=[], ReleaseDateDueDate=[], Orden=[],speed = 1, rddd = 0, distribution = "uniform" , seed = 1, tpm=[],json=False,dzn=False,taillard=False ,savepath = ""):
-#         jsp = JSP(jobs=jobs, machines=machines,ProcessingTime=ProcessingTime,EnergyConsumption=EnergyConsumption,ReleaseDateDueDate=ReleaseDateDueDate,Orden=Orden)
-#         jsp.fill_random_values(speed=speed, rddd=rddd, distribution=distribution, seed=seed,tpm=tpm)
-        # if json:
-        #     jsp.saveJsonFile(f"{savepath}/"+jm_path+f"{j}x{m}_{i}.json")
-
-        # if dzn:
-        #     jsp.saveTaillardStandardFile("./output_taillard.txt")
-        # if taillard:
-        #     jsp.saveTaillardStandardFile("./output_taillard.txt")
+class Generator:
+    def __init__( self,json = False, dzn = False, taillard = False, savepath="./"):
+        self.json = json
+        self.dzn = dzn
+        self.taillard = taillard
+        self.savepath = savepath
+        
+    def generate_new_instance(self, jobs = 10, machines = 4, ProcessingTime=[], EnergyConsumption=[], Orden=[],speed = 1, ReleaseDateDueDate = 0, distribution = "uniform" , seed = 0, tpm=[]):
+        jsp = JSP(jobs=jobs, machines=machines,ProcessingTime=ProcessingTime,EnergyConsumption=EnergyConsumption,Orden=Orden)
+        jsp.fill_random_values(speed = speed, rddd = ReleaseDateDueDate, distribution = distribution, seed = seed,tpm = tpm)
+        if not (self.json or self.dzn or self.taillard): return jsp
+        
+        j = str(jobs)
+        m = str(machines)
+        jm_path = str(j)+"_"+str(m)+"/"
+        
+        i = seed
+
+        if self.json:
+            jsp.saveJsonFile(f"{self.savepath}/JSON/"+jm_path.split("/")[0]+f"_{j}x{m}_{i}.json")
+        if self.dzn:
+            pkl_path = f"{self.savepath}/"+jm_path.split("/")[0]+f"_{j}x{m}_{i}.pkl"
+            jsp.savePythonFile(pkl_path)
+            jsp.saveDznFile(pkl_path,f"{self.savepath}/DZN/"+jm_path)#f"{j}x{m}_{i}")
+            os.remove(pkl_path)
+        if self.taillard:
+            jsp.saveTaillardStandardFile(f"{self.savepath}/TAILLARD/"+jm_path.split("/")[0]+f"_{j}x{m}_{i}.txt")
+        return jsp

IGJSP/main.py

@@ -17,19 +17,13 @@ try:
     # Número de Máquinas
     parser.add_argument('-M','--machines', type=json.loads, default='[4]')
     # Semilla
-    parser.add_argument('-s','--seeds', type= json.loads, default=1)
+    parser.add_argument('-s','--seeds', type= json.loads, default='[0]')
     # Tipo de problema
     # 1 - JSP, 2 - FlowJSP, 3 - FlexibleJSP, 4 - OpenJSP
     # parser.add_argument('-T','--type', type=int, default=1)
     # Niveles de dificultad
     # Speed Scaling
     parser.add_argument('-S', '--speed-scaling', type=int, default=1)
-    # Tiempo estandar de procesamiento de una máquina
-    parser.add_argument('-mpt', '--machine-processing-time', dest='mpt', type=json.loads, default=[])
-    # Energy 
-    parser.add_argument('-E', '--energy', type=int, default=0)
-    
-    parser.add_argument('-O', '--order', type=json.loads, default='[]')
 
     # Release and Due date
     # 0 -> Tiempo infinito
@@ -46,6 +40,7 @@ try:
     parser.add_argument('-Q', '--quantity', type=int, default=1)
     # Distribution
     parser.add_argument('-D','--distribution', type=str, default="normal")
+
     # JSON save
     parser.add_argument('-j','--json', type=bool, default=False)
     # DZN save
@@ -59,22 +54,17 @@ try:
     start = time.time()
     for j in tqdm(args.jobs,desc='Jobs',leave=False):
         for m in tqdm(args.machines,desc='Machines',leave=False):
-            for i in trange(args.quantity,desc='Quantity',leave=False):
-                jm_path = str(j )+"_"+str(m)+"/"
-                jsp = JSP(jobs=j, machines=m,ProcessingTime=args.mpt,EnergyConsumption=args.energy,ReleaseDateDueDate=args.release_due,Orden=args.order)
-                jsp.fill_random_values(speed=args.speed_scaling, rddd=args.release_due, distribution=args.distribution, seed=args.seeds)
-                if args.json:
-                    jsp.saveJsonFile(f"{args.path}/"+jm_path+f"{j}x{m}_{i}.json")
-                    pass
-                if args.dzn:
-                    jsp.savePythonFile(f"{args.path}/"+jm_path+str(j )+"_"+str(m)+".pkl")
-                    jsp.saveDznFile(f"{args.path}/"+jm_path+str(j )+"_"+str(m)+".pkl",f"{args.path}/"+jm_path+f"{j}x{m}_{i}.dzn")
-                    os.remove(f"{args.path}/"+jm_path+str(j )+"_"+str(m)+".pkl")
-                if args.taillard:
-                    jsp.saveTaillardStandardFile(f"{args.path}/"+jm_path+f"{j}x{m}_{i}.txt")
 
-
-                        
+            generator = Generator(json = args.json, dzn = args.dzn, taillard = args.taillard)
+            if len(args.seeds) < args.quantity:
+                # args.seeds = args.seeds + list(np.zeros(args.quantity - len(args.seeds),dtype=np.int64))
+                p_s = np.linspace(0, 100, num=100,dtype=np.int64)
+                for s in args.seeds:
+                    p_s = p_s[p_s!=s]
+                args.seeds = args.seeds+ list(p_s[:args.quantity-len(args.seeds)])
+            for i in trange(args.quantity,desc='Quantity',leave=False):
+                generator.savepath = args.path+"/instancesGenerated_"+str(i)
+                generator.generate_new_instance(jobs=j, machines=m,ReleaseDateDueDate =np.array(args.release_due),speed = args.speed_scaling,distribution = args.distribution, seed = args.seeds[i])
     
 except Exception as e:
     raise

igjsp-0.0.5.dist-info/METADATA

@@ -0,0 +1,216 @@
+Metadata-Version: 2.4
+Name: IGJSP
+Version: 0.0.5
+Summary: Instance generator for JSP
+Project-URL: Homepage, https://gps.blogs.upv.es/
+Author-email: GPS-UPV <gps@dsic.upv.es>
+License-File: LICENSE
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.9
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: tqdm
+Description-Content-Type: text/markdown
+
+# JSP Generator
+
+## Description
+Benchmark generator for the Job Shop Problem (BG-JSP)
+
+## Generating a JSP problem instance
+
+To generate an instance of the problem we will use the Generator class, located at the generador module.
+To do this, we initialize the generator, giving it the following parameters:
+
+1. **JSON:`json`**
+   - **Description**: Parameter that indicates if the generated instance will be stored in JSON format.
+   - **Possible values**: Boolean value. Only can get the values True or False.
+   - **Example of possible values**: `True`, `False`
+   - **Default value**: `False`
+
+2. **DZN:`dzn`**
+   - **Description**: Parameter that indicates if the generated instance will be stored in DZN format.
+   - **Possible values**: Boolean value. Only can get the values True or False.
+   - **Example of possible values**: `True`, `False`
+   - **Default value**: `False`
+
+3. **Taillard:`taillard`**
+   - **Description**: Parameter that indicates if the generated instance will be stored in taillard format.
+   - **Possible values**: Boolean value. Only can get the values True or False.
+   - **Example of possible values**: `True`, `False`
+   - **Default value**: `False`
+
+4. **Save Path:`savepath`**
+   - **Description**: Path where the problem instance file will be generated. 
+   - **Possible values**: String.
+   - **Example of possible values**: `./problems`, `./instances`
+   - **Default value**: `./output`
+
+
+Once the generator has been initialized we proceed to generate different instances of the JSP problem with different values for this initialization, for that we use the following function, using the following parameters to customize the generated instances:
+
+1. **Jobs:`jobs`**
+   - **Description**: Number of jobs that will have the problem generated.
+   - **Possible values**: Integer value.
+   - **Example of possible values**: `3`, `4`.
+   - **Default value**: `10`
+
+2. **Machines:`machines`**
+   - **Description**: Number of machines that will have the problem generated.
+   - **Possible values**: Integer value.
+   - **Example of possible values**: `6`, `2`.
+   - **Default value**: `4`
+
+3. **Release and Due Date:`ReleaseDateDueDate`**
+   - **Descripción**: Establish that each task has an instant of release and an instant of completion limit.
+   - **Possible values**: 
+      - `0`: Neither the works and operations of each of them will have an instant of release or time limit for completion.
+      - `1`: The work will have instant of release and instant of completion limit.
+      - `2`: The operations of each job will have a release time and a limiting end time.
+   - **Example of possible values**: `1`, `2`
+   - **Default value**: `0`
+
+4. **Speeds:`speed`**
+   - **Description**: Number of speeds that will be available to perform each task.
+   - **Possible values**: Integer value.
+   - **Example of possible values**: `3`, `5`
+   - **Default value**: `1`
+
+5. **Distribution:`distribution`**
+   - **Description**: Type of distribution to be followed for data generation.
+   - **Possible values**: You can only set one of the following values: `uniform` `normal` `exponential`
+   - **Example of possible values**: `uniform`, `exponential`
+   - **Default value**: `normal`
+
+6. **Seed:`seed`**
+   - **Description**: Base number for data generation.
+   - **Possible values**: Integer value.
+   - **Example of possible values**: `84`, `32`
+   - **Default value**: `1`
+
+## Example of JSON generated
+
+This JSON shows how the data generated from an JSP problem with 2 machines and 4 jobs will look like. For this generation we have the following code:
+``` python
+from IGJSP.generador import Generator
+generator = Generator(json=True,savepath="output")
+generator.generate_new_instance(jobs=4,machines=2,ReleaseDateDueDate=2,distribution="exponential",seed=53) 
+```
+
+```json
+{
+    "nbJobs": [
+        0,
+        1
+    ],
+    "nbMchs": [
+        0,
+        1,
+        2,
+        3
+    ],
+    "speed": 1,
+    "timeEnergy": [
+        {
+            "jobId": 0,
+            "operations": {
+                "0": {
+                    "speed-scaling": [
+                        {
+                            "procTime": 8,
+                            "energyCons": 92
+                        }
+                    ],
+                    "release-date": 30,
+                    "due-date": 41
+                },
+                "2": {
+                    "speed-scaling": [
+                        {
+                            "procTime": 17,
+                            "energyCons": 84
+                        }
+                    ],
+                    "release-date": 41,
+                    "due-date": 77
+                },
+                "3": {
+                    "speed-scaling": [
+                        {
+                            "procTime": 3,
+                            "energyCons": 97
+                        }
+                    ],
+                    "release-date": 77,
+                    "due-date": 80
+                },
+                "1": {
+                    "speed-scaling": [
+                        {
+                            "procTime": 7,
+                            "energyCons": 93
+                        }
+                    ],
+                    "release-date": 80,
+                    "due-date": 88
+                }
+            },
+            "release-date": 30,
+            "due-date": 88
+        },
+        {
+            "jobId": 1,
+            "operations": {
+                "1": {
+                    "speed-scaling": [
+                        {
+                            "procTime": 4,
+                            "energyCons": 96
+                        }
+                    ],
+                    "release-date": 0,
+                    "due-date": 5
+                },
+                "3": {
+                    "speed-scaling": [
+                        {
+                            "procTime": 3,
+                            "energyCons": 97
+                        }
+                    ],
+                    "release-date": 5,
+                    "due-date": 9
+                },
+                "2": {
+                    "speed-scaling": [
+                        {
+                            "procTime": 1,
+                            "energyCons": 99
+                        }
+                    ],
+                    "release-date": 9,
+                    "due-date": 10
+                },
+                "0": {
+                    "speed-scaling": [
+                        {
+                            "procTime": 6,
+                            "energyCons": 94
+                        }
+                    ],
+                    "release-date": 10,
+                    "due-date": 17
+                }
+            },
+            "release-date": 0,
+            "due-date": 17
+        }
+    ],
+    "minMakespan": 35,
+    "minEnergy": 752,
+    "maxMinMakespan": 14,
+    "maxMinEnergy": 0
+}
+```

igjsp-0.0.5.dist-info/RECORD

@@ -0,0 +1,15 @@
+IGJSP/generador.py,sha256=XtG-wE62Y6vDIgkzyA5Fo2p_FXNubdSK4wf7sFdftI8,22102
+IGJSP/main.py,sha256=qnpAdI9Nymfbb2t674EHKCZr1vG80tGyVT5RKMiGvZM,2727
+IGJSP/Minizinc/Models/RD/JSP0.mzn,sha256=cfN_E3RQ6nBulGfaOOYTd-zAgA5SI6E2saDlYtKCflg,2282
+IGJSP/Minizinc/Models/RD/JSP1.mzn,sha256=5B8cyw2WyKR8yEL1fFd0TaCAVhjPoxEJRJDPPEjJGEk,2840
+IGJSP/Minizinc/Models/RD/JSP2.mzn,sha256=ATqpg-Ow_VzjQJ_hZSSXiTXmwmqNqFsq81TZgcnjTks,2941
+IGJSP/Minizinc/Types/RD/JSP0.mzn,sha256=cfN_E3RQ6nBulGfaOOYTd-zAgA5SI6E2saDlYtKCflg,2282
+IGJSP/Minizinc/Types/RD/JSP1.mzn,sha256=5B8cyw2WyKR8yEL1fFd0TaCAVhjPoxEJRJDPPEjJGEk,2840
+IGJSP/Minizinc/Types/RD/JSP2.mzn,sha256=ATqpg-Ow_VzjQJ_hZSSXiTXmwmqNqFsq81TZgcnjTks,2941
+IGJSP/Minizinc/Types/RD/type0.dzn,sha256=alo54TrPd2svp-YeOq8rNhb42Aj5w4N1y1WYRxZ-aWM,225
+IGJSP/Minizinc/Types/RD/type1.dzn,sha256=r3f1uOoDnscjpXHbpvOWPGhGN0tmwkJ3NYIRP-NGk5M,298
+IGJSP/Minizinc/Types/RD/type2.dzn,sha256=ddJxLqR_WlUpycHhA_QulxiTx3o9neIzNESEt59VUx0,344
+igjsp-0.0.5.dist-info/METADATA,sha256=V9A4MCeKn0V2oPLF6zir6q7N24r9pf1uxVcqXNt3cdI,7369
+igjsp-0.0.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+igjsp-0.0.5.dist-info/licenses/LICENSE,sha256=JJvw-24-Kyyqu80L6pZ5UImXjuvta4gcDwypMgItrro,1079
+igjsp-0.0.5.dist-info/RECORD,,

{igjsp-0.0.4.dist-info → igjsp-0.0.5.dist-info}/licenses/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 GPS
+Copyright (c) 2024 GPS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

IGJSP/generador/10_4/10x4_0.dzn/10x4_0.dzn-0-1.dzn

@@ -1,8 +0,0 @@
-%SETS
-JOBS = 1..10;
-MACHINES = 1..4;
-SPEED    = 1;
-
-time = array3d(JOBS,MACHINES,1..SPEED,[]);
-energy = array3d(JOBS,MACHINES,1..SPEED,[]);
-precedence = array2d(JOBS,MACHINES,[3, 2, 1, 0, 2, 1, 3, 0, 1, 0, 3, 2, 0, 2, 1, 3, 1, 2, 0, 3, 2, 1, 0, 3, 3, 0, 2, 1, 1, 2, 0, 3, 2, 3, 1, 0, 2, 1, 3, 0]);