Commit 9553fef
authored
Mt/cut selector plugin (#565)
* Adds cutsel plugin
* Adds basic test_cutsel
* Makes test_cutsel more difficult, and actually use the cut-selector
* Adds intsupport and objparal getter functions
* Removed bug with sorting forcedcuts
* Adds getRowParallelism function to scip calls
* Adds SCIP(rowIsLocal,rowIsInGlobalCutPool,getCutLPSolCutoffDistance)
* Removes PY_SCIP_CALL wrapper in getRowNumIntCols
* Solution is now mandatorz for getCutLPSolCutoffDistance call
* Corrects the sorting order of the test_cutsel
* Fixed misspelling of parallel and adds getRowLinear()
* Fixes error with misses arg in PySepaExecSol
* Adds missing depth argument to PySepaExecsol
* Adds getdualsolval functionality
* Should look more cloesly at the conflict....
* Adds wrapper method for retrieval of dual sol of a row
* Adds wrapped functions for objective coefficient retrieval and norm of a row
* Adds scipGetNSepaRounds call
* Adds writing of best transformed solution
* Adds writeTransSol method
* Adds gil calls to cutsel functions
* Updates CHANGELOG
Co-authored-by: Mark <turner@zib.de>1 parent 0fbd25d commit 9553fef
5 files changed
Lines changed: 360 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
5 | 22 | | |
6 | 23 | | |
7 | 24 | | |
8 | 25 | | |
9 | 26 | | |
| 27 | + | |
10 | 28 | | |
11 | 29 | | |
12 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 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 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
364 | 364 | | |
365 | 365 | | |
366 | 366 | | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
367 | 373 | | |
368 | 374 | | |
369 | 375 | | |
| |||
736 | 742 | | |
737 | 743 | | |
738 | 744 | | |
| 745 | + | |
739 | 746 | | |
740 | 747 | | |
741 | 748 | | |
| |||
789 | 796 | | |
790 | 797 | | |
791 | 798 | | |
| 799 | + | |
792 | 800 | | |
| 801 | + | |
793 | 802 | | |
794 | 803 | | |
795 | 804 | | |
| |||
815 | 824 | | |
816 | 825 | | |
817 | 826 | | |
| 827 | + | |
| 828 | + | |
| 829 | + | |
818 | 830 | | |
819 | 831 | | |
820 | 832 | | |
| |||
1081 | 1093 | | |
1082 | 1094 | | |
1083 | 1095 | | |
| 1096 | + | |
| 1097 | + | |
| 1098 | + | |
| 1099 | + | |
| 1100 | + | |
| 1101 | + | |
| 1102 | + | |
| 1103 | + | |
| 1104 | + | |
| 1105 | + | |
| 1106 | + | |
| 1107 | + | |
| 1108 | + | |
| 1109 | + | |
| 1110 | + | |
| 1111 | + | |
| 1112 | + | |
| 1113 | + | |
1084 | 1114 | | |
1085 | 1115 | | |
1086 | 1116 | | |
| |||
1198 | 1228 | | |
1199 | 1229 | | |
1200 | 1230 | | |
| 1231 | + | |
1201 | 1232 | | |
1202 | 1233 | | |
1203 | 1234 | | |
| |||
1301 | 1332 | | |
1302 | 1333 | | |
1303 | 1334 | | |
| 1335 | + | |
1304 | 1336 | | |
1305 | 1337 | | |
1306 | 1338 | | |
| |||
1690 | 1722 | | |
1691 | 1723 | | |
1692 | 1724 | | |
| 1725 | + | |
1693 | 1726 | | |
1694 | 1727 | | |
1695 | 1728 | | |
1696 | 1729 | | |
1697 | 1730 | | |
1698 | 1731 | | |
| 1732 | + | |
1699 | 1733 | | |
1700 | 1734 | | |
1701 | 1735 | | |
| |||
0 commit comments