IGJSP 0.0.8__tar.gz → 0.0.10__tar.gz

{igjsp-0.0.8 → igjsp-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IGJSP
-Version: 0.0.8
+Version: 0.0.10
 Summary: Instance generator for JSP
 Project-URL: Homepage, https://gps.blogs.upv.es/
 Author-email: GPS-UPV <gps@dsic.upv.es>

{igjsp-0.0.8 → igjsp-0.0.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "IGJSP"
-version = "0.0.8"
+version = "0.0.10"
 authors = [
   { name="GPS-UPV", email="gps@dsic.upv.es" },
 ]
@@ -26,4 +26,4 @@ dependencies = [
 Homepage = "https://gps.blogs.upv.es/"
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/IGJSP","src/Minizinc"]
+packages = ["src/IGJSP","src/IGJSP/Minizinc"]

{igjsp-0.0.8 → igjsp-0.0.10}/src/IGJSP/generador.py

@@ -12,7 +12,11 @@ import networkx as nx
 import numpy as np
 from scipy.stats import expon, norm, uniform
 from pprint import pprint
+import sys
 
+import importlib_resources
+from importlib.resources import read_text
+minizinc_files = importlib_resources.files("IGJSP")
 
 def f(x):
     return int(np.exp(-int(x)/100)*100)
@@ -67,6 +71,7 @@ class JSP:
 
         self._jobToMachine(release_date_tasks, timePer, distribution)
         self.generate_maxmin_objective_values()
+        self.vectorization()
 
     def _particionate_speed_space(self, speed):
         energyPer = np.linspace(0.5, 3, speed) if speed > 1 else [1]
@@ -181,8 +186,8 @@ class JSP:
                     "machines": data.numMchs,
                     "jobs": data.numJobs,
                     "Speed": s,
-                    "time": list(time.flatten()),
-                    "energy": list(energy.flatten())
+                    "time": list(map(int,time.flatten())),
+                    "energy": list(map(int,energy.flatten()))
                 }
                 if t == 1:
                     replace_data["releaseDate"] = [data.ReleaseDueDate[job, 0] for job in range(data.numJobs)]
@@ -194,11 +199,12 @@ class JSP:
                 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())
+                replace_data["precedence"] = list(map(int,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:
+                # new_object = data.change_rddd_type(t).select_speeds(list(range(s0, sf, sp)))
+                with open(minizinc_files.joinpath("Minizinc/Types/RD", f"type{t}.dzn"), "r", encoding="utf-8") as file:
                     filedata = file.read()
+                    # filedata = file
                     for kk, v in replace_data.items():
                         filedata = filedata.replace("{" + kk + "}", str(v))
 
@@ -400,7 +406,7 @@ class JSP:
         vectorization["min_makespan"]    = self.min_makespan
         vectorization["max_sum_energy"]   = self.max_energy
         vectorization["min_sum_energy"]   = self.min_energy
-        vectorization["max_tardiness"]   = self.max_tardiness
+        vectorization["max_tardiness"]   = self.max_tardiness if self.rddd != 0 else 0
         vectorization["min_window"]     = 0
         vectorization["max_window"]     = 0
         vectorization["mean_window"]    = 0
@@ -465,7 +471,7 @@ class JSP:
         vectorization["max_energy_value"]     = np.max(self.ProcessingTime)
         vectorization["min_energy_value"]     = np.min(self.ProcessingTime)
         vectorization["mean_energy_value"]    = np.mean(self.ProcessingTime)
-
+        self.features = vectorization
         return vectorization
     
     def disjuntive_graph(self):