0000000000000000000000000000000000000000 bfa178adb8d21915da2a1594ab3680fc3d55b1fb Brendan O'Donoghue <bodonoghue85@gmail.com> 1600251960 +0100	branch: Created from refs/remotes/origin/qp2
bfa178adb8d21915da2a1594ab3680fc3d55b1fb 76a543702645f548eb27dea1c583695c3b809452 Brendan O'Donoghue <bodonoghue85@gmail.com> 1600252048 +0100	commit: init var to silence warning
76a543702645f548eb27dea1c583695c3b809452 b295ffccb01a3d2c298aab3322c08856cc3a16db Brendan O'Donoghue <bodonoghue85@gmail.com> 1601214476 +0100	commit: move scale from data into matrix, swap malloc to calloc in scs.c
b295ffccb01a3d2c298aab3322c08856cc3a16db 4ba544bb81235d1684ca6f8c2d1ed71b5db951b6 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601727762 +0100	commit: update to latest aa version
4ba544bb81235d1684ca6f8c2d1ed71b5db951b6 8c75583cdbc0480fb0aa19b74a3d68dbbd9f0f60 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601728179 +0100	commit: cleanup test_failure_rate
8c75583cdbc0480fb0aa19b74a3d68dbbd9f0f60 4c168102270b59d1eb96c4c76e22d3b8297dc967 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601728196 +0100	revert: Revert "update to latest aa version"
4c168102270b59d1eb96c4c76e22d3b8297dc967 8c75583cdbc0480fb0aa19b74a3d68dbbd9f0f60 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601728468 +0100	reset: moving to HEAD^
8c75583cdbc0480fb0aa19b74a3d68dbbd9f0f60 8acd67f114010d00f1e28cc19057661446b8583c Brendan O'Donoghue <bodonoghue85@gmail.com> 1601738290 +0100	commit: cleanup cone boundaries and some normalization
8acd67f114010d00f1e28cc19057661446b8583c 5b5920bcbce968fa0913b0488e4a089d0bf55dac Brendan O'Donoghue <bodonoghue85@gmail.com> 1601739956 +0100	commit: combine ruiz and l2 passes
5b5920bcbce968fa0913b0488e4a089d0bf55dac 11b432bf1e4ebdb7cbcf4cef810f19ca19b42108 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601740489 +0100	commit: scale to 10 for now
11b432bf1e4ebdb7cbcf4cef810f19ca19b42108 13611bf8aa81b6f055faeab1ffe670c7a9d7269b Brendan O'Donoghue <bodonoghue85@gmail.com> 1601740742 +0100	commit: change defaults slightly
13611bf8aa81b6f055faeab1ffe670c7a9d7269b e296618a46417cbe1aaef1ffceb4496be7560396 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601741437 +0100	commit: change defaults slightly
e296618a46417cbe1aaef1ffceb4496be7560396 0c8236476efc66fda72ed9322506d9445cd88c1b Brendan O'Donoghue <bodonoghue85@gmail.com> 1601816908 +0100	commit: add box cone, need to update normalization still though
0c8236476efc66fda72ed9322506d9445cd88c1b 448e3775122fd51400d544584204dc1f767ec82f Brendan O'Donoghue <bodonoghue85@gmail.com> 1601827038 +0100	commit: more box cone updates
448e3775122fd51400d544584204dc1f767ec82f a824181281565aad760466f474240fdde47e5a06 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601827750 +0100	commit: fix mem error
a824181281565aad760466f474240fdde47e5a06 c8f3de6c6ed098cb5abed97c72a628849acb5640 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601827963 +0100	commit: fix mem leak
c8f3de6c6ed098cb5abed97c72a628849acb5640 25e4f5f7976bf8e2f1292dce707c52fa00c362eb Brendan O'Donoghue <bodonoghue85@gmail.com> 1601888423 +0100	commit: add normalization to box cone
25e4f5f7976bf8e2f1292dce707c52fa00c362eb ed439dfcd68331a87acb584760b634471aa3ea06 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601889030 +0100	commit: minor update message
ed439dfcd68331a87acb584760b634471aa3ea06 ecf9cee09723a7256370788729c96eb3c64d96f9 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601891109 +0100	commit: better bound checking box cone
ecf9cee09723a7256370788729c96eb3c64d96f9 ab88a3c7f42fe8bea8a7108b8a0c9b585e2b7376 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601891291 +0100	commit: better comp slack computing
ab88a3c7f42fe8bea8a7108b8a0c9b585e2b7376 652ce85aca0bda7ae063de64961bf01d660c1582 Brendan O'Donoghue <bodonoghue85@gmail.com> 1601892184 +0100	commit: comment out stale warning
652ce85aca0bda7ae063de64961bf01d660c1582 e99d0b2bb0ffa337d89c499cfc8a95958226dc8f Brendan O'Donoghue <bodonoghue85@gmail.com> 1601922487 +0100	commit: checking in broken state
e99d0b2bb0ffa337d89c499cfc8a95958226dc8f 1a20db65031f6b888631bc00804f0221f13cb43f Brendan O'Donoghue <bodonoghue85@gmail.com> 1601981814 +0100	pull: Fast-forward
1a20db65031f6b888631bc00804f0221f13cb43f deb6864c7489bca8a153b15f02563143a7264f4b Brendan O'Donoghue <bodonoghue85@gmail.com> 1602002933 +0100	commit: cleaner rescaling
deb6864c7489bca8a153b15f02563143a7264f4b e1948e223ed883fcc09802e3dc2c3123d00e5dfb Brendan O'Donoghue <bodonoghue85@gmail.com> 1602006773 +0100	commit: update v correctly when rescaling
e1948e223ed883fcc09802e3dc2c3123d00e5dfb 85b68cb8db7e14193f603fff8583496c92bd24b0 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602072216 +0100	commit: simpler lin sys warm start
85b68cb8db7e14193f603fff8583496c92bd24b0 e958e738a9c5360b12c8a58bf583d95d1c9d748f Brendan O'Donoghue <bodonoghue85@gmail.com> 1602091075 +0100	commit: add log to csv file functionality
e958e738a9c5360b12c8a58bf583d95d1c9d748f 7e2815d539c5ea7c14308f366a7dceb9c0e9a3db Brendan O'Donoghue <bodonoghue85@gmail.com> 1602094596 +0100	commit: improve logging
7e2815d539c5ea7c14308f366a7dceb9c0e9a3db 9c27460d380c265dcde4aeaebf0ee230f9576ea3 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602095781 +0100	commit: add adaptive scaling to header
9c27460d380c265dcde4aeaebf0ee230f9576ea3 54324dda2d7098b33d52e186300739b0619ad7be Brendan O'Donoghue <bodonoghue85@gmail.com> 1602148785 +0100	commit: reduce eps back to 1e-5
54324dda2d7098b33d52e186300739b0619ad7be 31dc079e0c86f26f19406753c32e24241e1035f6 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602172134 +0100	commit: Update rw logic.
31dc079e0c86f26f19406753c32e24241e1035f6 91c84dd4ba51202d5b296c879f240b6637baa12f Brendan O'Donoghue <bodonoghue85@gmail.com> 1602181809 +0100	commit: Swap to (t,x) input format for box cone.
91c84dd4ba51202d5b296c879f240b6637baa12f e71a90b0c0501ecd4a003359b0614a86d3be7a9a Brendan O'Donoghue <bodonoghue85@gmail.com> 1602260658 +0100	commit: some updates on the adaptive scaling
e71a90b0c0501ecd4a003359b0614a86d3be7a9a e4c297a87d7632e03370a9a68f9b090122c7f6b5 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602518758 +0100	commit: Update some exp cone params to ensure greater accuracy (though slower).
e4c297a87d7632e03370a9a68f9b090122c7f6b5 50900c31106c6dc289a4ef700a148a01cf0c1c9d Brendan O'Donoghue <bodonoghue85@gmail.com> 1602520266 +0100	commit: Fix bug where when the objective is empty indirect solver fails.
50900c31106c6dc289a4ef700a148a01cf0c1c9d 2a01c951b796c5f665ce9f41afe3c328f23c8f1e Brendan O'Donoghue <bodonoghue85@gmail.com> 1602520595 +0100	commit: Reduce rho_x to 1e-6.
2a01c951b796c5f665ce9f41afe3c328f23c8f1e 8cff98407700072bee70a3a9a8701a44b790c2d2 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602520628 +0100	commit: add tau scale, WIP
8cff98407700072bee70a3a9a8701a44b790c2d2 68ba0f3e42442fe0f8127f718a9358b8d93f4898 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602584860 +0100	commit: fix null ptr dereference
68ba0f3e42442fe0f8127f718a9358b8d93f4898 aa868d6fa6bd3e9cf01010767096b9d3bc3fb157 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602595363 +0100	commit: fix return best iterate bug where data was mangled
aa868d6fa6bd3e9cf01010767096b9d3bc3fb157 28ba9b2b9c27813e6ee06c347d00830339b34a2a Brendan O'Donoghue <bodonoghue85@gmail.com> 1602605003 +0100	commit: Minor cleanup of indirect private.c
28ba9b2b9c27813e6ee06c347d00830339b34a2a 3977e54614abaa79a174eaa531d3a9dbb21a8d8c Brendan O'Donoghue <bodonoghue85@gmail.com> 1602607464 +0100	commit: Fix issue where we were asking indirect solver to solve to too high an accuracy,
3977e54614abaa79a174eaa531d3a9dbb21a8d8c eb4d96c4e4ba694ccfbe278285de9a9129338e7c Brendan O'Donoghue <bodonoghue85@gmail.com> 1602608777 +0100	commit: tweak warm start to be cone projection output
eb4d96c4e4ba694ccfbe278285de9a9129338e7c ddd5893458374ee98dafff5969f564a06a7a18c8 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602613462 +0100	commit: cheaper scale updates for indirect solver
ddd5893458374ee98dafff5969f564a06a7a18c8 1414b71ca7c7669c770fe67f3b23211c7c782f75 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602696512 +0100	commit: broken - checking in WIP
1414b71ca7c7669c770fe67f3b23211c7c782f75 98da9fa8bbf108bad382d04e39e7c4dbde25f22e Brendan O'Donoghue <bodonoghue85@gmail.com> 1602701933 +0100	pull: Fast-forward
98da9fa8bbf108bad382d04e39e7c4dbde25f22e 7f95a3256b629be0f2042f6d5ddadf8f2c4f8764 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602703682 +0100	commit: fixes for infeas
7f95a3256b629be0f2042f6d5ddadf8f2c4f8764 0a71678425742badff222b5ea812fa3f64229fc1 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602759936 +0100	commit: fix null deref when normalize=false
0a71678425742badff222b5ea812fa3f64229fc1 270d37e84d7c2e5160d20383eddc40d655c76f99 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602761002 +0100	commit: rename some residual members
270d37e84d7c2e5160d20383eddc40d655c76f99 8e277968cbf8d4cd0b8f43ec7bc275155069cbb4 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602763544 +0100	commit: update comment
8e277968cbf8d4cd0b8f43ec7bc275155069cbb4 ddd02c6373d850264b433b081d73057b12b3f6de Brendan O'Donoghue <bodonoghue85@gmail.com> 1602779612 +0100	commit: another refactor of residuals
ddd02c6373d850264b433b081d73057b12b3f6de 8f7b8ca8569c3e8a0fac4fe45af3bfebd9de21ea Brendan O'Donoghue <bodonoghue85@gmail.com> 1602787091 +0100	commit: more residual updating
8f7b8ca8569c3e8a0fac4fe45af3bfebd9de21ea f83e3a1e8b31226663a86b8f5c9cba04b2fc7426 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602787667 +0100	commit: typo
f83e3a1e8b31226663a86b8f5c9cba04b2fc7426 a57b29d026a5c5811f7c7532973c11bc1f6d10b7 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602843253 +0100	commit: support vector of rho_y scale values
a57b29d026a5c5811f7c7532973c11bc1f6d10b7 1fdeb76da5ea8d5e750f5a4796c4daed99229ab1 Brendan O'Donoghue <bodonoghue85@gmail.com> 1602844643 +0100	pull: Fast-forward
1fdeb76da5ea8d5e750f5a4796c4daed99229ab1 600c61f274e9779e49c240d31ad1027cd49c60da Brendan O'Donoghue <bodonoghue85@gmail.com> 1602856688 +0100	commit: cleaning up
600c61f274e9779e49c240d31ad1027cd49c60da 38afa92b24e5da3b706eeeb2def29da9db799fb2 Brendan O'Donoghue <bodonoghue85@gmail.com> 1604428914 +0000	commit: Update exp cone routine, add rho logic to cones.
38afa92b24e5da3b706eeeb2def29da9db799fb2 57af2ebd8e05cd16ef02165fc74d737d3bdab40a Brendan O'Donoghue <bodonoghue85@gmail.com> 1604428944 +0000	commit: Minor update to rw logic.
57af2ebd8e05cd16ef02165fc74d737d3bdab40a bc99443e311637595f52d8b3f9ffa8ce9b891495 Brendan O'Donoghue <bodonoghue85@gmail.com> 1604428987 +0000	commit: Add some flags to run_from_file.
bc99443e311637595f52d8b3f9ffa8ce9b891495 bb2793ee319ef62720bcbdaad11cf99079dd9ff3 Brendan O'Donoghue <bodonoghue85@gmail.com> 1604429027 +0000	commit: Reduce ETA in aa.
bb2793ee319ef62720bcbdaad11cf99079dd9ff3 c44cb375bb9d0ae2842bf39ea9662a302301d655 Brendan O'Donoghue <bodonoghue85@gmail.com> 1604429061 +0000	commit: Add missing cone header.
c44cb375bb9d0ae2842bf39ea9662a302301d655 62d4ed05a52bc428713d3b67a8c098ff5bf6c518 Brendan O'Donoghue <bodonoghue85@gmail.com> 1604432165 +0000	commit: checking in some progress
62d4ed05a52bc428713d3b67a8c098ff5bf6c518 9cc00e91b8b2e0bcb9e70f3de084cb91a7a9de1d Brendan O'Donoghue <bodonoghue85@gmail.com> 1608652847 +0000	merge master: Merge made by the 'recursive' strategy.
9cc00e91b8b2e0bcb9e70f3de084cb91a7a9de1d 15e0f6917e1f8dc35ace3607a1e4d0c203bcf431 Brendan O'Donoghue <bodonoghue85@gmail.com> 1609336184 +0000	commit: plumb through aa interval settings
15e0f6917e1f8dc35ace3607a1e4d0c203bcf431 eef43520ffab9070b58ddf95500f7eab53416af1 Brendan O'Donoghue <bodonoghue85@gmail.com> 1609601096 +0000	commit: tweak adaptive scaling, add abs, rel, infeas eps settings
eef43520ffab9070b58ddf95500f7eab53416af1 01fcf9e99327f0a5d549e7273f03fe93ce03389f Brendan O'Donoghue <bodonoghue85@gmail.com> 1609602006 +0000	commit: eps_* now <0 check
01fcf9e99327f0a5d549e7273f03fe93ce03389f e72a464330eeb8af80b0dc2492e95ae215e73e4c Brendan O'Donoghue <bodonoghue85@gmail.com> 1610645476 +0000	commit: Fix box cone bug.
e72a464330eeb8af80b0dc2492e95ae215e73e4c 610bf4a6a13eebea915eec2b16476eab7c935e7f Brendan O'Donoghue <bodonoghue85@gmail.com> 1610708918 +0000	commit: More box cone fixes.
610bf4a6a13eebea915eec2b16476eab7c935e7f f4069f103053d08a0bae2dcee94c907a4b635ccb Brendan O'Donoghue <bodonoghue85@gmail.com> 1610883984 +0000	commit: Broken cones refactor.
f4069f103053d08a0bae2dcee94c907a4b635ccb dbb5203caca884bb7827f198c94126a993755d9b Brendan O'Donoghue <bodonoghue85@gmail.com> 1610887986 +0000	commit: checking in
dbb5203caca884bb7827f198c94126a993755d9b ed821b49079fd348a1199283cd661c745507f242 Brendan O'Donoghue <bodonoghue85@gmail.com> 1611068638 +0000	pull: Fast-forward
ed821b49079fd348a1199283cd661c745507f242 896ced0b1b0f258313a9748dc84128a5d79de33b Brendan O'Donoghue <bodonoghue85@gmail.com> 1611068645 +0000	merge _qp_tmp: Fast-forward
896ced0b1b0f258313a9748dc84128a5d79de33b 885dd7c75bfce6679bd896fa3691f075d38e376b Brendan O'Donoghue <bodonoghue85@gmail.com> 1611068703 +0000	merge 885dd7c75bfce6679bd896fa3691f075d38e376b: Fast-forward
885dd7c75bfce6679bd896fa3691f075d38e376b e2803a489843d089cfe2b4cb7be0fe391bb5e148 Brendan O'Donoghue <bodonoghue85@gmail.com> 1611077410 +0000	commit: checking in
e2803a489843d089cfe2b4cb7be0fe391bb5e148 4abc36aae2467b99815263b8b3bddbdd231a3262 Brendan O'Donoghue <bodonoghue85@gmail.com> 1611078279 +0000	pull: Fast-forward
4abc36aae2467b99815263b8b3bddbdd231a3262 bd00f4e9c1110be1b252ec0d33b3ebdfdc6306b3 Brendan O'Donoghue <bodonoghue85@gmail.com> 1611089438 +0000	commit: normalization tweaks
bd00f4e9c1110be1b252ec0d33b3ebdfdc6306b3 43d3461522bc8ffa84631d40ec0ceb4f344897fa Brendan O'Donoghue <bodonoghue85@gmail.com> 1611238516 +0000	revert: Revert "normalization tweaks"
43d3461522bc8ffa84631d40ec0ceb4f344897fa 85550fcc6f40aaff6400d40260937ba7484d387e Brendan O'Donoghue <bodonoghue85@gmail.com> 1611238518 +0000	revert: Revert "scaling fix"
85550fcc6f40aaff6400d40260937ba7484d387e 630bb0e072a8fa3b7a07b597ec4564d776f8c9a9 Brendan O'Donoghue <bodonoghue85@gmail.com> 1611238519 +0000	revert: Revert "checking in"
