File tree
10 files changed
+817
-157
lines changed- doc/OnlineDocs/explanation/solvers
- pyomo/contrib/pyros
- tests
10 files changed
+817
-157
lines changedLines changed: 70 additions & 19 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
963 | 963 |
| |
964 | 964 |
| |
965 | 965 |
| |
966 |
| - | |
967 |
| - | |
968 |
| - | |
969 |
| - | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
970 | 970 |
| |
971 | 971 |
| |
972 | 972 |
| |
| |||
1025 | 1025 |
| |
1026 | 1026 |
| |
1027 | 1027 |
| |
1028 |
| - | |
1029 |
| - | |
1030 |
| - | |
1031 |
| - | |
1032 |
| - | |
| 1028 | + | |
| 1029 | + | |
| 1030 | + | |
| 1031 | + | |
1033 | 1032 |
| |
1034 | 1033 |
| |
1035 | 1034 |
| |
1036 | 1035 |
| |
1037 | 1036 |
| |
1038 | 1037 |
| |
1039 | 1038 |
| |
1040 |
| - | |
| 1039 | + | |
1041 | 1040 |
| |
1042 |
| - | |
1043 |
| - | |
1044 |
| - | |
1045 |
| - | |
1046 |
| - | |
1047 |
| - | |
1048 |
| - | |
| 1041 | + | |
| 1042 | + | |
| 1043 | + | |
| 1044 | + | |
| 1045 | + | |
| 1046 | + | |
| 1047 | + | |
1049 | 1048 |
| |
1050 | 1049 |
| |
1051 | 1050 |
| |
1052 | 1051 |
| |
1053 | 1052 |
| |
1054 |
| - | |
1055 |
| - | |
| 1053 | + | |
| 1054 | + | |
1056 | 1055 |
| |
1057 | 1056 |
| |
1058 | 1057 |
| |
| |||
1133 | 1132 |
| |
1134 | 1133 |
| |
1135 | 1134 |
| |
| 1135 | + | |
| 1136 | + | |
| 1137 | + | |
| 1138 | + | |
| 1139 | + | |
| 1140 | + | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
| 1171 | + | |
| 1172 | + | |
| 1173 | + | |
| 1174 | + | |
| 1175 | + | |
| 1176 | + | |
| 1177 | + | |
| 1178 | + | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
| 1182 | + | |
| 1183 | + | |
| 1184 | + | |
| 1185 | + | |
| 1186 | + | |
1136 | 1187 |
| |
1137 | 1188 |
| |
1138 | 1189 |
| |
|
Lines changed: 13 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
6 | 16 |
| |
7 | 17 |
| |
8 | 18 |
| |
9 | 19 |
| |
10 | 20 |
| |
| 21 | + | |
| 22 | + | |
| 23 | + | |
11 | 24 |
| |
12 | 25 |
| |
13 | 26 |
| |
|
Lines changed: 59 additions & 9 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
| 16 | + | |
16 | 17 |
| |
17 | 18 |
| |
18 | 19 |
| |
| |||
58 | 59 |
| |
59 | 60 |
| |
60 | 61 |
| |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
61 | 94 |
| |
62 | 95 |
| |
63 | 96 |
| |
| |||
720 | 753 |
| |
721 | 754 |
| |
722 | 755 |
| |
723 |
| - | |
| 756 | + | |
724 | 757 |
| |
725 | 758 |
| |
726 |
| - | |
727 |
| - | |
728 |
| - | |
729 |
| - | |
730 |
| - | |
731 |
| - | |
732 |
| - | |
733 |
| - | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
| 782 | + | |
| 783 | + | |
734 | 784 |
| |
735 | 785 |
| |
736 | 786 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
33 | 33 |
| |
34 | 34 |
| |
35 | 35 |
| |
36 |
| - | |
| 36 | + | |
37 | 37 |
| |
38 | 38 |
| |
39 | 39 |
| |
|
Lines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
327 | 327 |
| |
328 | 328 |
| |
329 | 329 |
| |
| 330 | + | |
330 | 331 |
| |
331 | 332 |
| |
332 | 333 |
| |
|
Lines changed: 32 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
387 | 387 |
| |
388 | 388 |
| |
389 | 389 |
| |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
390 | 394 |
| |
391 | 395 |
| |
392 | 396 |
| |
393 |
| - | |
394 | 397 |
| |
395 | 398 |
| |
396 | 399 |
| |
397 | 400 |
| |
398 | 401 |
| |
399 |
| - | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
400 | 406 |
| |
401 |
| - | |
402 |
| - | |
403 |
| - | |
| 407 | + | |
404 | 408 |
| |
405 | 409 |
| |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
406 | 428 |
| |
407 | 429 |
| |
408 | 430 |
| |
| |||
567 | 589 |
| |
568 | 590 |
| |
569 | 591 |
| |
570 |
| - | |
| 592 | + | |
571 | 593 |
| |
572 | 594 |
| |
573 | 595 |
| |
| |||
629 | 651 |
| |
630 | 652 |
| |
631 | 653 |
| |
| 654 | + | |
632 | 655 |
| |
633 | 656 |
| |
| 657 | + | |
634 | 658 |
| |
635 | 659 |
| |
636 |
| - | |
637 | 660 |
| |
638 | 661 |
| |
639 | 662 |
| |
| |||
1294 | 1317 |
| |
1295 | 1318 |
| |
1296 | 1319 |
| |
| 1320 | + | |
| 1321 | + | |
1297 | 1322 |
| |
1298 | 1323 |
| |
1299 | 1324 |
| |
|
0 commit comments