Skip to content

Commit d04fb37

Browse files
Copilotbernalde
Copilot
and
bernalde
committed
Complete fixes for generate_model_size_report.py - all Copilot feedback addressed
Co-authored-by: bernalde <8647329+bernalde@users.noreply.github.com>
1 parent 4ec182b commit d04fb37

File tree

17 files changed

+177
-16
lines changed

17 files changed

+177
-16
lines changed

‎README.md‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,23 @@ The library includes the following models:
2929

3030
Each model directory contains its own README.md with detailed model descriptions and specific usage instructions.
3131

32-
## Model Size Example
33-
34-
Here's an example of model size metrics for the Jobshop model:
35-
36-
| Component | Number |
37-
|:----------------------|---------:|
38-
| variables | 10 |
39-
| binary_variables | 6 |
40-
| integer_variables | 0 |
41-
| continuous_variables | 4 |
42-
| disjunctions | 3 |
43-
| disjuncts | 6 |
44-
| constraints | 9 |
45-
| nonlinear_constraints | 0 |
46-
47-
You can generate size reports for other models using the `generate_model_size_report.py` script.
32+
## Model Size Comparison
33+
34+
The following table shows the size metrics for all models in GDPlib:
35+
36+
| Component | batch_processing | biofuel | cstr | disease_model | ex1_linan_2023 | gdp_col | hda | jobshop | med_term_purchasing | methanol | modprodnet | positioning | small_batch | spectralog | stranded_gas | syngas | water_network |
37+
|:----------------------|-------------------:|----------:|-------:|----------------:|-----------------:|----------:|------:|----------:|----------------------:|-----------:|-------------:|--------------:|--------------:|-------------:|---------------:|---------:|----------------:|
38+
| variables | 288 | 36840 | 76 | 1250 | 12 | 442 | 1158 | 10 | 1165 | 287 | 488 | 56 | 37 | 128 | 57810 | 367 | 395 |
39+
| binary_variables | 138 | 516 | 20 | 52 | 10 | 30 | 12 | 6 | 216 | 8 | 2 | 50 | 18 | 60 | 192 | 46 | 10 |
40+
| integer_variables | 0 | 4356 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 363 | 0 | 0 | 0 | 45360 | 0 | 0 |
41+
| continuous_variables | 150 | 31968 | 56 | 1198 | 2 | 412 | 1146 | 4 | 949 | 279 | 123 | 6 | 19 | 68 | 12258 | 321 | 385 |
42+
| disjunctions | 9 | 252 | 10 | 26 | 2 | 15 | 6 | 3 | 72 | 4 | 1 | 25 | 9 | 30 | 96 | 23 | 5 |
43+
| disjuncts | 18 | 516 | 20 | 52 | 10 | 30 | 12 | 6 | 216 | 8 | 2 | 50 | 18 | 60 | 192 | 46 | 10 |
44+
| constraints | 601 | 12884 | 100 | 831 | 10 | 610 | 728 | 9 | 762 | 429 | 486 | 30 | 34 | 158 | 14959 | 543 | 329 |
45+
| nonlinear_constraints | 1 | 12 | 17 | 0 | 0 | 262 | 151 | 0 | 0 | 55 | 1 | 25 | 1 | 8 | 18 | 48 | 33 |
46+
47+
This table was automatically generated using the `generate_model_size_report.py` script.
48+
4849

4950
## Installation
5051

‎gdplib/batch_processing/model_size_report.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Component | Number |
2+
|:----------------------|---------:|
3+
| variables | 288 |
4+
| binary_variables | 138 |
5+
| integer_variables | 0 |
6+
| continuous_variables | 150 |
7+
| disjunctions | 9 |
8+
| disjuncts | 18 |
9+
| constraints | 601 |
10+
| nonlinear_constraints | 1 |

‎gdplib/biofuel/model_size_report.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Component | Number |
2+
|:----------------------|---------:|
3+
| variables | 36840 |
4+
| binary_variables | 516 |
5+
| integer_variables | 4356 |
6+
| continuous_variables | 31968 |
7+
| disjunctions | 252 |
8+
| disjuncts | 516 |
9+
| constraints | 12884 |
10+
| nonlinear_constraints | 12 |

‎gdplib/cstr/model_size_report.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Component | Number |
2+
|:----------------------|---------:|
3+
| variables | 76 |
4+
| binary_variables | 20 |
5+
| integer_variables | 0 |
6+
| continuous_variables | 56 |
7+
| disjunctions | 10 |
8+
| disjuncts | 20 |
9+
| constraints | 100 |
10+
| nonlinear_constraints | 17 |

‎gdplib/disease_model/model_size_report.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Component | Number |
2+
|:----------------------|---------:|
3+
| variables | 1250 |
4+
| binary_variables | 52 |
5+
| integer_variables | 0 |
6+
| continuous_variables | 1198 |
7+
| disjunctions | 26 |
8+
| disjuncts | 52 |
9+
| constraints | 831 |
10+
| nonlinear_constraints | 0 |

‎gdplib/ex1_linan_2023/model_size_report.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Component | Number |
2+
|:----------------------|---------:|
3+
| variables | 12 |
4+
| binary_variables | 10 |
5+
| integer_variables | 0 |
6+
| continuous_variables | 2 |
7+
| disjunctions | 2 |
8+
| disjuncts | 10 |
9+
| constraints | 10 |
10+
| nonlinear_constraints | 0 |

‎gdplib/gdp_col/model_size_report.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Component | Number |
2+
|:----------------------|---------:|
3+
| variables | 442 |
4+
| binary_variables | 30 |
5+
| integer_variables | 0 |
6+
| continuous_variables | 412 |
7+
| disjunctions | 15 |
8+
| disjuncts | 30 |
9+
| constraints | 610 |
10+
| nonlinear_constraints | 262 |

‎gdplib/hda/model_size_report.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Component | Number |
2+
|:----------------------|---------:|
3+
| variables | 1158 |
4+
| binary_variables | 12 |
5+
| integer_variables | 0 |
6+
| continuous_variables | 1146 |
7+
| disjunctions | 6 |
8+
| disjuncts | 12 |
9+
| constraints | 728 |
10+
| nonlinear_constraints | 151 |

‎gdplib/med_term_purchasing/model_size_report.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Component | Number |
2+
|:----------------------|---------:|
3+
| variables | 1165 |
4+
| binary_variables | 216 |
5+
| integer_variables | 0 |
6+
| continuous_variables | 949 |
7+
| disjunctions | 72 |
8+
| disjuncts | 216 |
9+
| constraints | 762 |
10+
| nonlinear_constraints | 0 |

‎gdplib/methanol/model_size_report.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
| Component | Number |
2+
|:----------------------|---------:|
3+
| variables | 287 |
4+
| binary_variables | 8 |
5+
| integer_variables | 0 |
6+
| continuous_variables | 279 |
7+
| disjunctions | 4 |
8+
| disjuncts | 8 |
9+
| constraints | 429 |
10+
| nonlinear_constraints | 55 |

0 commit comments

Comments
 (0)