File tree
9 files changed
+232
-79
lines changed- doc/OnlineDocs/explanation/solvers
- pyomo/contrib/pyros
- tests
9 files changed
+232
-79
lines changedLines changed: 26 additions & 24 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
906 | 906 |
| |
907 | 907 |
| |
908 | 908 |
| |
909 |
| - | |
910 |
| - | |
| 909 | + | |
| 910 | + | |
911 | 911 |
| |
912 | 912 |
| |
913 | 913 |
| |
914 | 914 |
| |
915 |
| - | |
| 915 | + | |
916 | 916 |
| |
917 | 917 |
| |
918 | 918 |
| |
| |||
927 | 927 |
| |
928 | 928 |
| |
929 | 929 |
| |
930 |
| - | |
| 930 | + | |
931 | 931 |
| |
932 | 932 |
| |
933 | 933 |
| |
| |||
953 | 953 |
| |
954 | 954 |
| |
955 | 955 |
| |
956 |
| - | |
| 956 | + | |
957 | 957 |
| |
958 | 958 |
| |
959 | 959 |
| |
| |||
963 | 963 |
| |
964 | 964 |
| |
965 | 965 |
| |
966 |
| - | |
| 966 | + | |
967 | 967 |
| |
968 | 968 |
| |
969 |
| - | |
| 969 | + | |
970 | 970 |
| |
971 | 971 |
| |
972 | 972 |
| |
| |||
977 | 977 |
| |
978 | 978 |
| |
979 | 979 |
| |
980 |
| - | |
| 980 | + | |
981 | 981 |
| |
982 | 982 |
| |
983 | 983 |
| |
| |||
998 | 998 |
| |
999 | 999 |
| |
1000 | 1000 |
| |
| 1001 | + | |
1001 | 1002 |
| |
1002 | 1003 |
| |
1003 | 1004 |
| |
| |||
1025 | 1026 |
| |
1026 | 1027 |
| |
1027 | 1028 |
| |
1028 |
| - | |
1029 |
| - | |
1030 |
| - | |
1031 |
| - | |
| 1029 | + | |
| 1030 | + | |
| 1031 | + | |
| 1032 | + | |
| 1033 | + | |
1032 | 1034 |
| |
1033 | 1035 |
| |
1034 | 1036 |
| |
1035 | 1037 |
| |
1036 |
| - | |
| 1038 | + | |
1037 | 1039 |
| |
1038 | 1040 |
| |
1039 |
| - | |
| 1041 | + | |
1040 | 1042 |
| |
1041 |
| - | |
1042 |
| - | |
1043 |
| - | |
1044 |
| - | |
1045 |
| - | |
1046 |
| - | |
1047 |
| - | |
| 1043 | + | |
| 1044 | + | |
| 1045 | + | |
| 1046 | + | |
| 1047 | + | |
| 1048 | + | |
| 1049 | + | |
1048 | 1050 |
| |
1049 | 1051 |
| |
1050 |
| - | |
| 1052 | + | |
1051 | 1053 |
| |
1052 | 1054 |
| |
1053 |
| - | |
1054 |
| - | |
| 1055 | + | |
| 1056 | + | |
1055 | 1057 |
| |
1056 | 1058 |
| |
1057 | 1059 |
| |
|
Lines changed: 9 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 | + | |
6 | 15 |
| |
7 | 16 |
| |
8 | 17 |
| |
|
Lines changed: 20 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
855 | 855 |
| |
856 | 856 |
| |
857 | 857 |
| |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
858 | 878 |
| |
859 | 879 |
| |
860 | 880 |
| |
|
Lines changed: 16 additions & 28 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 |
| - | |
17 |
| - | |
18 | 16 |
| |
19 | 17 |
| |
20 | 18 |
| |
| |||
37 | 35 |
| |
38 | 36 |
| |
39 | 37 |
| |
| 38 | + | |
40 | 39 |
| |
41 | 40 |
| |
42 | 41 |
| |
| |||
828 | 827 |
| |
829 | 828 |
| |
830 | 829 |
| |
831 |
| - | |
832 |
| - | |
833 |
| - | |
834 |
| - | |
835 |
| - | |
836 |
| - | |
837 |
| - | |
838 |
| - | |
839 |
| - | |
840 |
| - | |
841 |
| - | |
842 |
| - | |
843 |
| - | |
844 |
| - | |
845 |
| - | |
846 |
| - | |
847 |
| - | |
848 |
| - | |
849 |
| - | |
850 |
| - | |
851 |
| - | |
852 |
| - | |
853 |
| - | |
854 |
| - | |
855 | 830 |
| |
| 831 | + | |
856 | 832 |
| |
857 | 833 |
| |
858 | 834 |
| |
| |||
867 | 843 |
| |
868 | 844 |
| |
869 | 845 |
| |
870 |
| - | |
871 | 846 |
| |
872 | 847 |
| |
873 | 848 |
| |
| |||
879 | 854 |
| |
880 | 855 |
| |
881 | 856 |
| |
882 |
| - | |
883 | 857 |
| |
884 | 858 |
| |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
885 | 873 |
| |
886 | 874 |
| |
887 | 875 |
| |
|
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: 12 additions & 26 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
15 | 15 |
| |
16 | 16 |
| |
17 | 17 |
| |
18 |
| - | |
19 | 18 |
| |
20 | 19 |
| |
21 | 20 |
| |
| |||
39 | 38 |
| |
40 | 39 |
| |
41 | 40 |
| |
| 41 | + | |
42 | 42 |
| |
43 | 43 |
| |
44 | 44 |
| |
| |||
1093 | 1093 |
| |
1094 | 1094 |
| |
1095 | 1095 |
| |
1096 |
| - | |
1097 |
| - | |
1098 |
| - | |
1099 |
| - | |
1100 |
| - | |
1101 |
| - | |
1102 |
| - | |
1103 |
| - | |
1104 |
| - | |
1105 |
| - | |
1106 |
| - | |
1107 |
| - | |
1108 |
| - | |
1109 |
| - | |
1110 |
| - | |
1111 |
| - | |
1112 |
| - | |
1113 |
| - | |
1114 |
| - | |
1115 |
| - | |
1116 |
| - | |
1117 |
| - | |
1118 |
| - | |
1119 |
| - | |
1120 | 1096 |
| |
1121 | 1097 |
| |
1122 | 1098 |
| |
1123 | 1099 |
| |
1124 | 1100 |
| |
1125 | 1101 |
| |
1126 | 1102 |
| |
1127 |
| - | |
1128 | 1103 |
| |
1129 | 1104 |
| |
1130 | 1105 |
| |
| 1106 | + | |
| 1107 | + | |
| 1108 | + | |
| 1109 | + | |
| 1110 | + | |
| 1111 | + | |
| 1112 | + | |
| 1113 | + | |
| 1114 | + | |
| 1115 | + | |
| 1116 | + | |
1131 | 1117 |
| |
1132 | 1118 |
| |
1133 | 1119 |
| |
|
Lines changed: 32 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
696 | 696 |
| |
697 | 697 |
| |
698 | 698 |
| |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
| 724 | + | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
699 | 731 |
| |
700 | 732 |
| |
701 | 733 |
| |
|
0 commit comments