Merge branch 'main' into codex/find-and-fix-important-bug

Author: bernalde

gdplib/jobshop/jobshop.py

@@ -17,9 +17,9 @@
 #
 # Jobshop example from http://www.gams.com/modlib/libhtml/logmip4.htm
 #
-# This model solves a jobshop scheduling, which has a set of jobs
-# which must be processed in sequence of stages but not all jobs
-# require all stages. A zero wait transfer policy is assumed between
+# This model solves a jobshop scheduling problem, which has a set of jobs
+# that must be processed in sequence of stages but not all jobs
+# require all stages. A zero-wait transfer policy is assumed between
 # stages. To obtain a feasible solution it is necessary to eliminate
 # all clashes between jobs. It requires that no two jobs be performed
 # at any stage at any time. The objective is to minimize the makespan,
@@ -75,7 +75,7 @@ def t_bounds(model, I):
 
         Parameters
         ----------
-        model : Pyomo.Abstractmodel
+        model : Pyomo.AbstractModel
             The job shop scheduling model, which has a set of jobs which must be processed in sequence of stages but not all jobs require all stages.
             A zero wait transfer policy is assumed between stages.
         I : str
@@ -102,7 +102,7 @@ def _L_filter(model, I, K, J):
 
         Parameters
         ----------
-        model : Pyomo.Abstractmodel
+        model : Pyomo.AbstractModel
             The jobshop scheduling model, which has a set of jobs which must be processed in sequence of stages but not all jobs require all stages.
             A zero wait transfer policy is assumed between stages.
         I : str
@@ -135,7 +135,7 @@ def _feas(model, I):
 
         Parameters
         ----------
-        model : Pyomo.Abstractmodel
+        model : Pyomo.AbstractModel
             The jobshop scheduling model, which has a set of jobs which must be processed in sequence of stages but not all jobs require all stages.
             A zero wait transfer policy is assumed between stages.
         I : str
@@ -202,7 +202,7 @@ def _disj(model, I, K, J):
 
         Parameters
         ----------
-        model : Pyomo.Abstractmodel
+        model : Pyomo.AbstractModel
             jobshop scheduling model, which has a set of jobs which must be processed in sequence of stages but not all jobs require all stages.
         I : str
             job index

gdplib/kaibel/kaibel_init.py

@@ -3,8 +3,8 @@
                             temperature values.
             (written by E. Soraya Rawlings, esoraya@rwlngs.net)
 
-The separation of four components require a sequence of at least three distillation
-columns. Here, we calculate the minimum number of theoretical trays for the three
+The separation of four components requires a sequence of at least three distillation columns.
+Here, we calculate the minimum number of theoretical trays for the three
 columns. The sequence is shown in Figure 2.
 
          COLUMN 1              COLUMN 2              COLUMN 3

gdplib/small_batch/gdp_small_batch.py

@@ -35,7 +35,7 @@ def build_model():
     ----------
     [1] Kocis, G. R.; Grossmann, I. E. (1988). Global Optimization of Nonconvex Mixed-Integer Nonlinear Programming (MINLP) Problems in Process Synthesis. Ind. Eng. Chem. Res., 27(8), 1407-1421. https://doi.org/10.1021/ie00080a013
 
-    [2] Ovalle, D., Liñán, D. A., Lee, A., Gómez, J. M., Ricardez-Sandoval, L., Grossmann, I. E., & Neira, D. E. B. (2024). Logic-Based Discrete-Steepest Descent: A Solution Method for Process Synthesis Generalized Disjunctive Programs. arXiv preprint arXiv:2405.05358. https://doi.org/10.48550/arXiv.2405.05358
+    [2] Ovalle, D., Liñán, D. A., Lee, A., Gómez, J. M., Ricardez-Sandoval, L., Grossmann, I. E., & Bernal Neira, D. E. (2024). Logic-Based Discrete-Steepest Descent: A Solution Method for Process Synthesis Generalized Disjunctive Programs. arXiv preprint arXiv:2405.05358. https://doi.org/10.48550/arXiv.2405.05358
     """
     NK = 3
 

requirements-dev.txt

@@ -1,7 +1,9 @@
 # Development requirements for GDPlib
+-r requirements.txt
+
 pytest>=6.0.0
 pytest-cov>=2.10.0
 black>=20.8b1
 flake8>=3.8.0
 setuptools>=64
-setuptools_scm[toml]>=6.2
+setuptools_scm[toml]>=6.2